diff options
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/Manifest.gz | bin | 11738 -> 11736 bytes | |||
| -rw-r--r-- | dev-qt/qt-creator/Manifest | 4 | ||||
| -rw-r--r-- | dev-qt/qt-creator/metadata.xml | 6 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 6 |
4 files changed, 13 insertions, 3 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 4bcc4284f6bd..121063dcab58 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index fde452ee3862..ca2d07dd9671 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -7,5 +7,5 @@ DIST qt-creator-opensource-src-15.0.1-vendor.tar.xz 508860 BLAKE2B c5a7eef8250c6 DIST qt-creator-opensource-src-15.0.1.tar.xz 53250336 BLAKE2B f59160c113122d5c10935c7d088f57d36b41245587faf996244b6edde2b200536616247f8edaf0096f5e91750045c02b66bbcb68ee232b5e02e947e891ab6292 SHA512 fb3d75187607c57438beb9ec65c932e3abfd15566d8d11d612b7aa087b9df44d12d18138fbd61ece61ebc29be6d14d1ded3cd1deb1d946bd7d96f2ef2060f853 EBUILD qt-creator-15.0.0-r1.ebuild 8634 BLAKE2B dcbbdf019f125614d92b59013a527745dc6a77636c8e6cd418568e24c445908fa53a3e7bf2cc233a7142b6d46c7bd261ebffe2fe1c2759620c97f3a12c30980f SHA512 45b8e7bee8cd1b1746ea73c63d64ec112fc930e71187be4f79e63be75bc6b676c9869a3eb6490a90ee6f13a50e2adbd970425c313d2165903cd9363f48cd0ca3 EBUILD qt-creator-15.0.1.ebuild 8592 BLAKE2B 0f271643ff65ed599eaacbba6bcfcfa4bf1cbf485494b294b8d4ad4df8434242973515764a8766273e3bf2563791cec2d3e839e8838e1b54d0612d481f405fb5 SHA512 e9b4ac455641bfc4922c1ef92dfa2ea668906d4ce880dcfdc4d7fc125ae66010ba893c47f4b904a25acb5acbc79830f66850178ecf1439bc5adaefc39c4396bd -EBUILD qt-creator-9999.ebuild 8593 BLAKE2B 0bc81280529cf65603b26e286d0afa94cffd3f340a8de52e09e814f78e3db56f042c16db9186ed0085e2256cc65edacf058cd5a3527393ab086765731f7b1f6c SHA512 4e4ea31af4d86ff9ac49c9c590c28eab2148c5f809162d83e07caac1f1271d2ee25d1d442908c3f547b012e40716e991c92df3c8e44fc79977f72854325d487c -MISC metadata.xml 1368 BLAKE2B 23bb887e7df5ef502d2a73395e33bc6951b9a230b10cc7fa7b7a995896f47520d8c0a73134a8a454c96a53e7a834471c1e7f6719aee079830ec3b233e5de8391 SHA512 04624384df58abd8e50d5915db90aed4ee84c2301f7eca52bd3301df8202030fefb1c792b9837a806ed1e44745280c0dd5732825504bcf928d58b828151b00eb +EBUILD qt-creator-9999.ebuild 8834 BLAKE2B c82e2cbfe31ce0ba50be7f78c16967a88958e207a954ee5d193951c56e5af89ca2bfd5b9398451a6b6c2f888a9ff2bfa434cfaf9cd1a2fb941d62fd8bde5186a SHA512 4645c4fcd876e83d05d65b02b94b90b89c426a9e190f14a0040d8b6a1a3f241cd9b7c884c985e041a8519d338d1ac720b314b39c10938f25128e60961a3402c8 +MISC metadata.xml 1432 BLAKE2B f26e11ae50746ac3c991a6287e14a0cfd3c7f0035b8de55c26bcba7ee31a55b890a7a02f851c5451464bc46bd45ff711265c6d3d4dce808b80de10564082403f SHA512 0666fcf3f2f38404f41c84dee5451697f8501231964da57f236b06d14670bf4301b3108c88f75d7eb7f2723189b1efa7779189ea4e1435e195e6a4824d50db32 diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml index 44e472f45a98..d0b42ff4836c 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -14,7 +14,11 @@ <flag name="qmldesigner">Build QmlDesigner and related plugins (Insight, StudioWelcome)</flag> <flag name="serialterminal">Build the serial terminal plugin</flag> <flag name="tracing">Build plugins for tracing requiring extra dependencies (AppStatisticsMonitor, CtfVisualizer, PerfProfiler, QmlProfiler)</flag> - <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> with the help USE rather than bundled litehtml</flag> + <flag name="webengine"> + Allow using <pkg>dev-qt/qtwebengine</pkg> for + better USE=help display, and for Design Viewer + Connector support with USE=qmldesigner + </flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 3ed1685d4f1f..248b71441708 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -71,6 +71,8 @@ COMMON_DEPEND=" qmldesigner? ( >=dev-qt/qtquick3d-${QT_PV}= >=dev-qt/qtsvg-${QT_PV} + >=dev-qt/qtwebsockets-${QT_PV} + webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) ) serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) svg? ( >=dev-qt/qtsvg-${QT_PV} ) @@ -184,6 +186,10 @@ src_configure() { # https://bugreports.qt.io/browse/QTCREATORBUG-29169 $(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes) + # help shouldn't use with the above, but qmldesigner is automagic + $(use help || use qmldesigner && + cmake_use_find_package webengine Qt6WebEngineWidgets) + -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) -DENABLE_SVG_SUPPORT=$(usex svg) $(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925 |