I would have preferred you not commit this to master. It pollutes master and I would guess 4.12 will come out before kf5. Please revert and make a new branch for kf5<span></span><div><div><br></div><div>Kurt</div><div><br>
<br>On Tuesday, August 13, 2013, Christophe Giboudeaux wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div>
<div style="font-family:Verdana,Arial,Helvetica,Sans-Serif">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border:1px #c9c399 solid">
<tbody><tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/111937/" target="_blank">http://git.reviewboard.kde.org/r/111937/</a>
</td>
</tr>
</tbody></table>
<br>
<p>Ship it!</p>
<p>- Christophe</p>
<br>
<p>On August 13th, 2013, 6:46 p.m. UTC, Alexander Richardson wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image:url('');background-repeat:repeat-x;border:1px black solid">
<tbody><tr>
<td>
<div>Review request for Konsole.</div>
<div>By Alexander Richardson.</div>
<p style="color:grey"><i>Updated Aug. 13, 2013, 6:46 p.m.</i></p>
<h1 style="color:#575012;font-size:10pt;margin-top:1.5em">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border:1px solid #b8b5a0">
<tbody><tr>
<td>
<pre style="margin:0;padding:0;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word">Port to KF5/Qt5
It will build for KF5 automatically if Qt5 is found.
You can override this behaviour by using cmake -DFORCE_QT4=ON
TerminalDisplayAccessible is disable for Qt5 currently since I don't
have any experience with accessible stuff and it is complicated than
just changing a few includes</pre>
</td>
</tr>
</tbody></table>
<h1 style="color:#575012;font-size:10pt;margin-top:1.5em">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border:1px solid #b8b5a0">
<tbody><tr>
<td>
<pre style="margin:0;padding:0;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word">It compiles fine (both Qt4 and Qt5).
After installation the terminal view of KF5 based okteta started working.</pre>
</td>
</tr>
</tbody></table>
<h1 style="color:#575012;font-size:10pt;margin-top:1.5em">Diffs </h1>
<ul style="margin-left:3em;padding-left:0">
<li>CMakeLists.txt <span style="color:grey">(5783804588bc4b1d1687e2dd1aaff76f3a65906e)</span></li>
<li>src/BookmarkHandler.h <span style="color:grey">(76c33269e5f20cbe20c97cfa621236cf05dc0f53)</span></li>
<li>src/BookmarkHandler.cpp <span style="color:grey">(9fc1600aa5a2901549f87295894acaf88b2f55ed)</span></li>
<li>src/CMakeLists.txt <span style="color:grey">(48601a147b4ba9a48eee064d9071382d6dd683b1)</span></li>
<li>src/ColorScheme.cpp <span style="color:grey">(6945c39144d12d8faefbb5242edfa1899e278477)</span></li>
<li>src/ColorSchemeEditor.cpp <span style="color:grey">(afe13c3a447197ff864639be3d6c136b146c8c66)</span></li>
<li>src/ColorSchemeManager.cpp <span style="color:grey">(802f5d7f9d3a1008a8785b27546a7ffa27fac24c)</span></li>
<li>src/EditProfileDialog.cpp <span style="color:grey">(aff67b5723e2f1e08cf6aebc82f4911ffadc353e)</span></li>
<li>src/Emulation.cpp <span style="color:grey">(02ed4be48a5916c75c7731864b33b4a825c31e6e)</span></li>
<li>src/Filter.cpp <span style="color:grey">(8f40c0c598bd1f61ec2ad9765c2399d0ba011744)</span></li>
<li>src/KeyBindingEditor.cpp <span style="color:grey">(005b9e32027dd14f9965ec6e2e7dd32e94b79272)</span></li>
<li>src/KeyboardTranslator.h <span style="color:grey">(99c71743d6c295c14381a83787baa061e7703878)</span></li>
<li>src/KeyboardTranslator.cpp <span style="color:grey">(8fe2acb40d75b62595b9823a990ba99f0e6e0509)</span></li>
<li>src/KeyboardTranslatorManager.cpp <span style="color:grey">(4d46210517e901b14e379dcfe435fd8fdedaeb09)</span></li>
<li>src/MainWindow.h <span style="color:grey">(b297883eb9d62215ac71564b77c2145c1c8eeacc)</span></li>
<li>src/MainWindow.cpp <span style="color:grey">(285d6347be6680632b912b51961ced4d797a10bc)</span></li>
<li>src/Part.h <span style="color:grey">(2806bcdb066814ca32e1905772e99a0b2de426e5)</span></li>
<li>src/Part.cpp <span style="color:grey">(33e2d3849629e415817dc9a5f241e4ac3a323a28)</span></li>
<li>src/PrintOptions.cpp <span style="color:grey">(5e802987d5872f9041438a1ee69ec8162ddb962a)</span></li>
<li>src/Profile.cpp <span style="color:grey">(14946ce69000eef00b03864e4610c6775597a51d)</span></li>
<li>src/SessionController.h <span style="color:grey">(036e0534960fe7a1bd32be04136ba162c0469413)</span></li>
<li>src/SessionController.cpp <span style="color:grey">(88fc50c6a164fed94eefc72a71e4460f15ede57e)</span></li>
<li>src/ShellCommand.cpp <span style="color:grey">(2b059a16e6232146cc9d75b1b6af25919fdcc4e7)</span></li>
<li>src/TerminalDisplay.cpp <span style="color:grey">(acfddc176bc68ae9b0f3a9ea52c958e37d14dff8)</span></li>
<li>src/TerminalDisplayAccessible.h <span style="color:grey">(c6964412559e880dd27cf66a9fa8759196a09980)</span></li>
<li>src/TerminalDisplayAccessible.cpp <span style="color:grey">(8d37dc5e13448fc5d8619078c50334b0813597d4)</span></li>
<li>src/ViewManager.cpp <span style="color:grey">(4b9708e4a135a3682b319351ba02ce1d310c3329)</span></li>
<li>src/Vt102Emulation.cpp <span style="color:grey">(0b6d2ed2f75630df9fc7ac5d6d2b5d9a6702f254)</span></li>
<li>src/main.cpp <span style="color:grey">(2afc62c721b0e77264d0784caf7fbbd70b13951f)</span></li>
<li>src/tests/PartTest.cpp <span style="color:grey">(72cd27de07c0e96f8986db3a40dcf9239d9b3529)</span></li>
<li>src/tests/ShellCommandTest.cpp <span style="color:grey">(d03964fda57a1b37d4a02c82c3c04fd00040aaff)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/111937/diff/" style="margin-left:3em" target="_blank">View Diff</a></p>
</td>
</tr>
</tbody></table>
</div>
</div>
</blockquote></div></div>