<table><tr><td style="">davidedmundson updated this revision to Diff 9040.<br />davidedmundson added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D3085" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>Rebased on master with merge conflict fixed<br />
Fixed cmake to work with Qt 5.7 and Qt5.8</p></div></div><br /><div><strong>REPOSITORY</strong><div><div>R135 Integration for Qt applications in Plasma</div></div></div><br /><div><strong>CHANGES SINCE LAST UPDATE</strong><div><a href="https://phabricator.kde.org/D3085?vs=7726&id=9040" rel="noreferrer">https://phabricator.kde.org/D3085?vs=7726&id=9040</a></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D3085" rel="noreferrer">https://phabricator.kde.org/D3085</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>CMakeLists.txt<br />
COPYING.LGPL-2<br />
COPYING.LGPL-3<br />
COPYING.LIB<br />
autotests/CMakeLists.txt<br />
cmake/modules/FindQt5PlatformSupport.cmake<br />
cmake/modules/FindQt5ThemeSupport.cmake<br />
src/platformtheme/CMakeLists.txt<br />
src/platformtheme/kdeplatformtheme.cpp<br />
src/platformtheme/kdeplatformtheme.h<br />
src/platformtheme/kwaylandintegration.cpp<br />
src/platformtheme/kwaylandintegration.h<br />
src/platformtheme/qdbusmenubar.cpp<br />
src/platformtheme/qdbusmenubar_p.h<br />
src/platformtheme/x11integration.cpp<br />
src/platformtheme/x11integration.h</div></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>davidedmundson, Plasma, broulik<br /><strong>Cc: </strong>dmitryshachnev, graesslin, plasma-devel, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas<br /></div>