diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2016-01-07 18:17:07 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-15 16:31:17 +0000 |
commit | 7814b33b5678a3a17b6c49e62b5a37958e57f1a3 (patch) | |
tree | f34653538c47dce710a40731fd91642c2fcfeb5e /documentation | |
parent | bf81969bbc87223f2ababa20f41f6d2f05dffcca (diff) | |
download | openembedded-core-contrib-7814b33b5678a3a17b6c49e62b5a37958e57f1a3.tar.gz |
ref-manual: Updates to cull out qt4 stuff.
Several areas changed throughout the ref-manual to remove qt4
referencing.
(From yocto-docs rev: 9ee721034ceb2bb7b7a9e64f6a6a7a2b3bfd1c82)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/ref-manual/migration.xml | 25 | ||||
-rw-r--r-- | documentation/ref-manual/ref-classes.xml | 60 | ||||
-rw-r--r-- | documentation/ref-manual/ref-features.xml | 3 | ||||
-rw-r--r-- | documentation/ref-manual/ref-images.xml | 3 | ||||
-rw-r--r-- | documentation/ref-manual/ref-structure.xml | 8 | ||||
-rw-r--r-- | documentation/ref-manual/ref-tasks.xml | 9 | ||||
-rw-r--r-- | documentation/ref-manual/ref-variables.xml | 9 | ||||
-rw-r--r-- | documentation/ref-manual/technical-details.xml | 7 |
8 files changed, 32 insertions, 92 deletions
diff --git a/documentation/ref-manual/migration.xml b/documentation/ref-manual/migration.xml index 21763e3a46..45ac041d92 100644 --- a/documentation/ref-manual/migration.xml +++ b/documentation/ref-manual/migration.xml @@ -2735,6 +2735,31 @@ </section> </section> +<section id='moving-to-the-yocto-project-2.1-release'> + <title>Moving to the Yocto Project 2.1 Release</title> + + <para> + This section provides migration information for moving to the + Yocto Project 2.1 Release from the prior release. + </para> + + <section id='migration-2.1-placeholder'> + <title>Stuff to Remember When Creating this Section</title> + + <para> + This is a note from Alexander Kanavin regarding qt4 stuff. + <note> + Qt4 recipes and classes have been removed in YP 2.1 because + Qt4.x has reached end of life upstream. For legacy applications + and LSB compliancy purposes Qt4 can be found in meta-qt4 + repository, and for any new development Qt5 is available at + meta-qt5 repository(provide links to both). + </note> + </para> + </section> +</section> + + </chapter> <!-- diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml index b2941b8bf9..2ce927858e 100644 --- a/documentation/ref-manual/ref-classes.xml +++ b/documentation/ref-manual/ref-classes.xml @@ -2869,66 +2869,6 @@ </para> </section> -<section id='ref-classes-qmake*'> - <title><filename>qmake*.bbclass</filename></title> - - <para> - The <filename>qmake*</filename> classes support recipes that - need to build software that uses Qt's <filename>qmake</filename> - build system and are comprised of the following: - <itemizedlist> - <listitem><para><emphasis><filename>qmake_base</filename>:</emphasis> - Provides base functionality for all versions of - <filename>qmake</filename>.</para></listitem> - <listitem><para><emphasis><filename>qmake2</filename>:</emphasis> - Extends base functionality for <filename>qmake</filename> 2.x as - used by Qt 4.x.</para></listitem> - </itemizedlist> - </para> - - <para> - If you need to set any configuration variables or pass any options to - <filename>qmake</filename>, you can add these to the - <link linkend='var-EXTRA_QMAKEVARS_PRE'><filename>EXTRA_QMAKEVARS_PRE</filename></link> - or - <link linkend='var-EXTRA_QMAKEVARS_POST'><filename>EXTRA_QMAKEVARS_POST</filename></link> - variables, depending on whether the arguments need to be before or - after the <filename>.pro</filename> file list on the command line, - respectively. - </para> - - <para> - By default, all <filename>.pro</filename> files are built. - If you want to specify your own subset of <filename>.pro</filename> - files to be built, specify them in the - <link linkend='var-QMAKE_PROFILES'><filename>QMAKE_PROFILES</filename></link> - variable. - </para> -</section> - -<section id='ref-classes-qt4*'> - <title><filename>qt4*.bbclass</filename></title> - - <para> - The <filename>qt4*</filename> classes support recipes that need to - build software that uses the Qt development framework version 4.x - and consist of the following: - <itemizedlist> - <listitem><para><emphasis><filename>qt4e</filename>:</emphasis> - Supports building against Qt/Embedded, which uses the - framebuffer for graphical output.</para></listitem> - <listitem><para><emphasis><filename>qt4x11</filename>:</emphasis> - Supports building against Qt/X11.</para></listitem> - </itemizedlist> - </para> - - <para> - The classes inherit the - <link linkend='ref-classes-qmake*'><filename>qmake2</filename></link> - class. - </para> -</section> - <section id='ref-classes-recipe_sanity'> <title><filename>recipe_sanity.bbclass</filename></title> diff --git a/documentation/ref-manual/ref-features.xml b/documentation/ref-manual/ref-features.xml index 798e0a2a18..1499853608 100644 --- a/documentation/ref-manual/ref-features.xml +++ b/documentation/ref-manual/ref-features.xml @@ -308,9 +308,6 @@ <listitem><para><emphasis>nfs-server:</emphasis> Installs an NFS server. </para></listitem> - <listitem><para><emphasis>qt4-pkgs:</emphasis> - Supports Qt4/X11 and demo applications. - </para></listitem> <listitem><para><emphasis>ssh-server-dropbear:</emphasis> Installs the Dropbear minimal SSH server. </para></listitem> diff --git a/documentation/ref-manual/ref-images.xml b/documentation/ref-manual/ref-images.xml index d15ca5b93a..b09d65cf3b 100644 --- a/documentation/ref-manual/ref-images.xml +++ b/documentation/ref-manual/ref-images.xml @@ -158,9 +158,6 @@ <listitem><para><filename>core-image-x11</filename>: A very basic X11 image with a terminal. </para></listitem> - <listitem><para><filename>qt4e-demo-image</filename>: - An image that launches into the demo application for the embedded - (not based on X11) version of Qt.</para></listitem> </itemizedlist> </para> </chapter> diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml index 48e39212a5..725435e700 100644 --- a/documentation/ref-manual/ref-structure.xml +++ b/documentation/ref-manual/ref-structure.xml @@ -1091,14 +1091,6 @@ </para> </section> - <section id='structure-meta-recipes-qt'> - <title><filename>meta/recipes-qt/</filename></title> - - <para> - This directory contains all things related to the Qt application framework. - </para> - </section> - <section id='structure-meta-recipes-rt'> <title><filename>meta/recipes-rt/</filename></title> diff --git a/documentation/ref-manual/ref-tasks.xml b/documentation/ref-manual/ref-tasks.xml index 21403c072c..c7f6a2e01a 100644 --- a/documentation/ref-manual/ref-tasks.xml +++ b/documentation/ref-manual/ref-tasks.xml @@ -700,15 +700,6 @@ The following sections describe miscellaneous tasks. </para> - <section id='ref-tasks-generate_qt_config_file'> - <title><filename>do_generate_qt_config_file</filename></title> - - <para> - Writes a <filename>qt.conf</filename> configuration - file used for building a Qt-based application. - </para> - </section> - <section id='ref-tasks-spdx'> <title><filename>do_spdx</filename></title> diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 0b2c426b68..56dffc001c 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml @@ -3958,7 +3958,7 @@ <para> This variable is used with recipes that inherit the - <link linkend='ref-classes-qmake*'><filename>qmake_base</filename></link> + <filename>qmake_base</filename> class or other classes that inherit <filename>qmake_base</filename>. </para> @@ -3980,7 +3980,7 @@ <para> This variable is used with recipes that inherit the - <link linkend='ref-classes-qmake*'><filename>qmake_base</filename></link> + <filename>qmake_base</filename> class or other classes that inherit <filename>qmake_base</filename>. </para> @@ -9874,7 +9874,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" <para> This variable is used with recipes that inherit the - <link linkend='ref-classes-qmake*'><filename>qmake_base</filename></link> + <filename>qmake_base</filename> class or other classes that inherit <filename>qmake_base</filename>. </para> @@ -10814,7 +10814,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" <glossdef> <para role="glossdeffirst"> <!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> - The toolchain binary prefix used for nativesdk recipes. + The toolchain binary prefix used for + <filename>nativesdk</filename> recipes. The OpenEmbedded build system uses the <filename>SDK_PREFIX</filename> value to set the <link linkend='var-TARGET_PREFIX'><filename>TARGET_PREFIX</filename></link> diff --git a/documentation/ref-manual/technical-details.xml b/documentation/ref-manual/technical-details.xml index 2df36521c2..bd4ad8f21f 100644 --- a/documentation/ref-manual/technical-details.xml +++ b/documentation/ref-manual/technical-details.xml @@ -1378,7 +1378,6 @@ <literallayout class='monospaced'> COMMERCIAL_AUDIO_PLUGINS ?= "" COMMERCIAL_VIDEO_PLUGINS ?= "" - COMMERCIAL_QT = "" </literallayout> If you want to enable these components, you can do so by making sure you have statements similar to the following @@ -1388,7 +1387,6 @@ gst-plugins-ugly-mpegaudioparse" COMMERCIAL_VIDEO_PLUGINS = "gst-plugins-ugly-mpeg2dec \ gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" - COMMERCIAL_QT ?= "qmmp" LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_gst-plugins-bad commercial_qmmp" </literallayout> Of course, you could also create a matching whitelist @@ -1406,9 +1404,8 @@ Specifying audio and video plug-ins as part of the <filename>COMMERCIAL_AUDIO_PLUGINS</filename> and <filename>COMMERCIAL_VIDEO_PLUGINS</filename> statements - or commercial Qt components as part of - the <filename>COMMERCIAL_QT</filename> statement (along - with the enabling <filename>LICENSE_FLAGS_WHITELIST</filename>) includes the + (along with the enabling + <filename>LICENSE_FLAGS_WHITELIST</filename>) includes the plug-ins or components into built images, thus adding support for media formats or components. </para> |