<div>bshah requested changes to this revision.<br />
bshah added a reviewer: bshah.<br />
bshah added a comment.<br />
This revision now requires changes to proceed.</div><br /><div><div><p>While looking at cmake, I realized one issue.. and to verify this I tried to build it and it didn't even build.. :\</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D1726#inline-6709" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">KF5WaylandConfig.cmake.in:10</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> add_test(NAME ${testBinaryName}-kwayland-test COMMAND
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> ${CMAKE_INSTALL_FULL_LIBEXECDIR}/org-kde-kf5-kwayland-testserver ${CMAKE_CURRENT_BINARY_DIR}/${testBinaryName}
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> )
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I've gut feeling this will not work on CI, I am 80% sure about this but can't verify because I can't build this at all.</p>
<p style="padding: 0; margin: 8px;">It works for you and me because in your local setup all repos are installed in same prefix, so CMAKE_INSTALL_FULL_LIBEXECDIR is same for all repos, while on CI each repo gets its own prefix, So on CI, when you will be using this CMAKE_INSTALL_FULL_LIBEXEC_DIR will resolve to repo using (e.g. kwayland-integration) this function and not to install prefix of kwayland.</p>
<p style="padding: 0; margin: 8px;">Change this line to,</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">@CMAKE_INSTALL_FULL_LIBEXECDIR@/org-kde-kf5-kwayland-testserver ${CMAKE_CURRENT_BINARY_DIR}/${testBinaryName}</pre></div>
<p style="padding: 0; margin: 8px;">instead.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D1726#inline-6706" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">testserver.cpp:140</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span class="n">m_seat</span><span style="color: #aa2211">-></span><span class="n">touchUp</span><span class="p">(</span><span class="n">it</span><span class="p">.</span><span class="n">value</span><span class="p">());</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span class="n">m_touchIdMapper</span><span class="p">.</span><span class="n">erase</span><span class="p">(</span><span class="n">it</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Actually this doesn't build for me.</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">/home/bshah/kdesrc/source/kwayland/src/tools/testserver/testserver.cpp:140:47: error: no viable conversion from 'const QHash<int, int>::const_iterator' to 'QHash<int, int>::iterator'
m_touchIdMapper.erase(it);
^~
/usr/include/qt/QtCore/qhash.h:296:11: note: candidate constructor (the implicit copy constructor) not viable: no known conversion from 'const QHash<int, int>::const_iterator' to 'const QHash<int, int>::iterator &' for 1st argument
class iterator
^
/usr/include/qt/QtCore/qhash.h:296:11: note: candidate constructor (the implicit move constructor) not viable: no known conversion from 'const QHash<int, int>::const_iterator' to 'QHash<int, int>::iterator &&' for 1st argument
class iterator
^
/usr/include/qt/QtCore/qhash.h:453:29: note: passing argument to parameter 'it' here
iterator erase(iterator it);
^
1 error generated.</pre></div>
<p style="padding: 0; margin: 8px;">(Using Qt 5.6)</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>rKWAYLAND KWayland</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D1726" rel="noreferrer">https://phabricator.kde.org/D1726</a></div></div><br /><div><strong>EMAIL PREFERENCES</strong><div><a href="https://phabricator.kde.org/settings/panel/emailpreferences/" rel="noreferrer">https://phabricator.kde.org/settings/panel/emailpreferences/</a></div></div><br /><div><strong>To: </strong>graesslin, sebas, Plasma, bshah<br /><strong>Cc: </strong>sebas, bshah, plasma-devel<br /></div>