diff --git a/dev-qt/qt5/qt5-5.8.0.recipe b/dev-qt/qt5/qt5-5.8.0.recipe index 5483cd2b6..924a8f385 100644 --- a/dev-qt/qt5/qt5-5.8.0.recipe +++ b/dev-qt/qt5/qt5-5.8.0.recipe @@ -7,7 +7,7 @@ HOMEPAGE="https://qt.io/" COPYRIGHT="2015-2017 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3" -REVISION="2" +REVISION="3" SOURCE_URI="https://download.qt.io/official_releases/qt/5.8/$portVersion/single/qt-everywhere-opensource-src-$portVersion.tar.xz" SOURCE_URI_2="https://download.qt.io/community_releases/5.8/$portVersion-final/qtwebkit-opensource-src-$portVersion.tar.xz" CHECKSUM_SHA256="0f4c54386d3dbac0606a936a7145cebb7b94b0ca2d29bc001ea49642984824b6" @@ -22,7 +22,6 @@ ADDITIONAL_FILES=" linguist.rdef.in qdbusviewer.rdef.in qhelpconverter.rdef.in - qmlviewer.rdef.in " ARCHITECTURES="!x86_gcc2 ?x86 x86_64" @@ -259,7 +258,6 @@ PROVIDES_devel=" cmd:qmlprofiler$secondaryArchSuffix = $portVersion compat >= 5 cmd:qmlscene$secondaryArchSuffix = $portVersion compat >= 5 cmd:qmltestrunner$secondaryArchSuffix = $portVersion compat >= 5 - cmd:qmlviewer$secondaryArchSuffix = $portVersion compat >= 5 cmd:qscxmlc$secondaryArchSuffix = $portVersion compat >= 5 cmd:qtattributionsscanner$secondaryArchSuffix = $portVersion compat >= 5 cmd:qtdiag$secondaryArchSuffix = $portVersion compat >= 5 @@ -413,7 +411,7 @@ INSTALL() lconvert lrelease lupdate pixeltool qcollectiongenerator qdbusviewer qdbus qgltf qhelpconverter qhelpgenerator qml qmleasing qmlimportscanner qmllint qmlmin qmlplugindump qmlprofiler qmlscene qmltestrunner - qtattributionsscanner qtdiag qtpaths qtplugininfo qmlviewer xmlpatterns + qtattributionsscanner qtdiag qtpaths qtplugininfo xmlpatterns xmlpatternsvalidator moc qdbuscpp2xml qdbusxml2cpp qdoc qlalr qmake qscxmlc rcc syncqt.pl uic" @@ -427,7 +425,7 @@ INSTALL() local MINOR="`echo "$portVersion" | cut -d. -f3`" local VARIETY="B_APPV_DEVELOPMENT" - iconFiles="assistant designer linguist qdbusviewer qhelpconverter qmlviewer" + iconFiles="assistant designer linguist qdbusviewer qhelpconverter" for j in $iconFiles; do sed \ -e "s|@MAJOR@|$MAJOR|" \ @@ -446,7 +444,6 @@ INSTALL() addAppDeskbarSymlink $binDir/designer "Qt/Designer" addAppDeskbarSymlink $binDir/linguist "Qt/Linguist" addAppDeskbarSymlink $binDir/qdbusviewer "Qt/Qt D-Bus Viewer" - addAppDeskbarSymlink $binDir/qmlviewer "Qt/QML Viewer" addAppDeskbarSymlink $binDir/qhelpconverter "Qt/Qt Help Converter" packageEntries docs \ diff --git a/dev-qt/qt5/qt5-5.9.0~beta.recipe b/dev-qt/qt5/qt5-5.9.0~beta.recipe index 3d52f7258..41c53926e 100644 --- a/dev-qt/qt5/qt5-5.9.0~beta.recipe +++ b/dev-qt/qt5/qt5-5.9.0~beta.recipe @@ -22,7 +22,6 @@ ADDITIONAL_FILES=" linguist.rdef.in qdbusviewer.rdef.in qhelpconverter.rdef.in - qmlviewer.rdef.in " ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" @@ -268,7 +267,6 @@ PROVIDES_devel=" cmd:qmlprofiler$secondaryArchSuffix = $portVersion compat >= 5 cmd:qmlscene$secondaryArchSuffix = $portVersion compat >= 5 cmd:qmltestrunner$secondaryArchSuffix = $portVersion compat >= 5 - cmd:qmlviewer$secondaryArchSuffix = $portVersion compat >= 5 cmd:qscxmlc$secondaryArchSuffix = $portVersion compat >= 5 cmd:qtattributionsscanner$secondaryArchSuffix = $portVersion compat >= 5 cmd:qtdiag$secondaryArchSuffix = $portVersion compat >= 5 @@ -424,7 +422,7 @@ INSTALL() lconvert lrelease lupdate pixeltool qcollectiongenerator qdbusviewer qdbus qgltf qhelpconverter qhelpgenerator qml qmlcachegen qmleasing qmlimportscanner qmllint qmlmin qmlplugindump qmlprofiler qmlscene - qmltestrunner qtattributionsscanner qtdiag qtpaths qtplugininfo qmlviewer + qmltestrunner qtattributionsscanner qtdiag qtpaths qtplugininfo xmlpatterns xmlpatternsvalidator moc qdbuscpp2xml qdbusxml2cpp qdoc qlalr qmake qscxmlc rcc syncqt.pl uic repc" @@ -438,7 +436,7 @@ INSTALL() local MINOR="0" local VARIETY="B_APPV_DEVELOPMENT" - iconFiles="assistant designer linguist qdbusviewer qhelpconverter qmlviewer" + iconFiles="assistant designer linguist qdbusviewer qhelpconverter" for j in $iconFiles; do sed \ -e "s|@MAJOR@|$MAJOR|" \ @@ -457,7 +455,6 @@ INSTALL() addAppDeskbarSymlink $binDir/designer "Qt/Designer" addAppDeskbarSymlink $binDir/linguist "Qt/Linguist" addAppDeskbarSymlink $binDir/qdbusviewer "Qt/Qt D-Bus Viewer" - addAppDeskbarSymlink $binDir/qmlviewer "Qt/QML Viewer" addAppDeskbarSymlink $binDir/qhelpconverter "Qt/Qt Help Converter" packageEntries docs \