summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
Diffstat (limited to 'documentation')
-rw-r--r--documentation/ref-manual/migration.xml25
-rw-r--r--documentation/ref-manual/ref-classes.xml60
-rw-r--r--documentation/ref-manual/ref-features.xml3
-rw-r--r--documentation/ref-manual/ref-images.xml3
-rw-r--r--documentation/ref-manual/ref-structure.xml8
-rw-r--r--documentation/ref-manual/ref-tasks.xml9
-rw-r--r--documentation/ref-manual/ref-variables.xml9
-rw-r--r--documentation/ref-manual/technical-details.xml7
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 @@
2735 </section> 2735 </section>
2736</section> 2736</section>
2737 2737
2738<section id='moving-to-the-yocto-project-2.1-release'>
2739 <title>Moving to the Yocto Project 2.1 Release</title>
2740
2741 <para>
2742 This section provides migration information for moving to the
2743 Yocto Project 2.1 Release from the prior release.
2744 </para>
2745
2746 <section id='migration-2.1-placeholder'>
2747 <title>Stuff to Remember When Creating this Section</title>
2748
2749 <para>
2750 This is a note from Alexander Kanavin regarding qt4 stuff.
2751 <note>
2752 Qt4 recipes and classes have been removed in YP 2.1 because
2753 Qt4.x has reached end of life upstream. For legacy applications
2754 and LSB compliancy purposes Qt4 can be found in meta-qt4
2755 repository, and for any new development Qt5 is available at
2756 meta-qt5 repository(provide links to both).
2757 </note>
2758 </para>
2759 </section>
2760</section>
2761
2762
2738 2763
2739</chapter> 2764</chapter>
2740<!-- 2765<!--
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 @@
2869 </para> 2869 </para>
2870</section> 2870</section>
2871 2871
2872<section id='ref-classes-qmake*'>
2873 <title><filename>qmake*.bbclass</filename></title>
2874
2875 <para>
2876 The <filename>qmake*</filename> classes support recipes that
2877 need to build software that uses Qt's <filename>qmake</filename>
2878 build system and are comprised of the following:
2879 <itemizedlist>
2880 <listitem><para><emphasis><filename>qmake_base</filename>:</emphasis>
2881 Provides base functionality for all versions of
2882 <filename>qmake</filename>.</para></listitem>
2883 <listitem><para><emphasis><filename>qmake2</filename>:</emphasis>
2884 Extends base functionality for <filename>qmake</filename> 2.x as
2885 used by Qt 4.x.</para></listitem>
2886 </itemizedlist>
2887 </para>
2888
2889 <para>
2890 If you need to set any configuration variables or pass any options to
2891 <filename>qmake</filename>, you can add these to the
2892 <link linkend='var-EXTRA_QMAKEVARS_PRE'><filename>EXTRA_QMAKEVARS_PRE</filename></link>
2893 or
2894 <link linkend='var-EXTRA_QMAKEVARS_POST'><filename>EXTRA_QMAKEVARS_POST</filename></link>
2895 variables, depending on whether the arguments need to be before or
2896 after the <filename>.pro</filename> file list on the command line,
2897 respectively.
2898 </para>
2899
2900 <para>
2901 By default, all <filename>.pro</filename> files are built.
2902 If you want to specify your own subset of <filename>.pro</filename>
2903 files to be built, specify them in the
2904 <link linkend='var-QMAKE_PROFILES'><filename>QMAKE_PROFILES</filename></link>
2905 variable.
2906 </para>
2907</section>
2908
2909<section id='ref-classes-qt4*'>
2910 <title><filename>qt4*.bbclass</filename></title>
2911
2912 <para>
2913 The <filename>qt4*</filename> classes support recipes that need to
2914 build software that uses the Qt development framework version 4.x
2915 and consist of the following:
2916 <itemizedlist>
2917 <listitem><para><emphasis><filename>qt4e</filename>:</emphasis>
2918 Supports building against Qt/Embedded, which uses the
2919 framebuffer for graphical output.</para></listitem>
2920 <listitem><para><emphasis><filename>qt4x11</filename>:</emphasis>
2921 Supports building against Qt/X11.</para></listitem>
2922 </itemizedlist>
2923 </para>
2924
2925 <para>
2926 The classes inherit the
2927 <link linkend='ref-classes-qmake*'><filename>qmake2</filename></link>
2928 class.
2929 </para>
2930</section>
2931
2932<section id='ref-classes-recipe_sanity'> 2872<section id='ref-classes-recipe_sanity'>
2933 <title><filename>recipe_sanity.bbclass</filename></title> 2873 <title><filename>recipe_sanity.bbclass</filename></title>
2934 2874
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 @@
308 <listitem><para><emphasis>nfs-server:</emphasis> 308 <listitem><para><emphasis>nfs-server:</emphasis>
309 Installs an NFS server. 309 Installs an NFS server.
310 </para></listitem> 310 </para></listitem>
311 <listitem><para><emphasis>qt4-pkgs:</emphasis>
312 Supports Qt4/X11 and demo applications.
313 </para></listitem>
314 <listitem><para><emphasis>ssh-server-dropbear:</emphasis> 311 <listitem><para><emphasis>ssh-server-dropbear:</emphasis>
315 Installs the Dropbear minimal SSH server. 312 Installs the Dropbear minimal SSH server.
316 </para></listitem> 313 </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 @@
158 <listitem><para><filename>core-image-x11</filename>: 158 <listitem><para><filename>core-image-x11</filename>:
159 A very basic X11 image with a terminal. 159 A very basic X11 image with a terminal.
160 </para></listitem> 160 </para></listitem>
161 <listitem><para><filename>qt4e-demo-image</filename>:
162 An image that launches into the demo application for the embedded
163 (not based on X11) version of Qt.</para></listitem>
164 </itemizedlist> 161 </itemizedlist>
165 </para> 162 </para>
166</chapter> 163</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 @@
1091 </para> 1091 </para>
1092 </section> 1092 </section>
1093 1093
1094 <section id='structure-meta-recipes-qt'>
1095 <title><filename>meta/recipes-qt/</filename></title>
1096
1097 <para>
1098 This directory contains all things related to the Qt application framework.
1099 </para>
1100 </section>
1101
1102 <section id='structure-meta-recipes-rt'> 1094 <section id='structure-meta-recipes-rt'>
1103 <title><filename>meta/recipes-rt/</filename></title> 1095 <title><filename>meta/recipes-rt/</filename></title>
1104 1096
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 @@
700 The following sections describe miscellaneous tasks. 700 The following sections describe miscellaneous tasks.
701 </para> 701 </para>
702 702
703 <section id='ref-tasks-generate_qt_config_file'>
704 <title><filename>do_generate_qt_config_file</filename></title>
705
706 <para>
707 Writes a <filename>qt.conf</filename> configuration
708 file used for building a Qt-based application.
709 </para>
710 </section>
711
712 <section id='ref-tasks-spdx'> 703 <section id='ref-tasks-spdx'>
713 <title><filename>do_spdx</filename></title> 704 <title><filename>do_spdx</filename></title>
714 705
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 @@
3958 3958
3959 <para> 3959 <para>
3960 This variable is used with recipes that inherit the 3960 This variable is used with recipes that inherit the
3961 <link linkend='ref-classes-qmake*'><filename>qmake_base</filename></link> 3961 <filename>qmake_base</filename>
3962 class or other classes that inherit 3962 class or other classes that inherit
3963 <filename>qmake_base</filename>. 3963 <filename>qmake_base</filename>.
3964 </para> 3964 </para>
@@ -3980,7 +3980,7 @@
3980 3980
3981 <para> 3981 <para>
3982 This variable is used with recipes that inherit the 3982 This variable is used with recipes that inherit the
3983 <link linkend='ref-classes-qmake*'><filename>qmake_base</filename></link> 3983 <filename>qmake_base</filename>
3984 class or other classes that inherit 3984 class or other classes that inherit
3985 <filename>qmake_base</filename>. 3985 <filename>qmake_base</filename>.
3986 </para> 3986 </para>
@@ -9874,7 +9874,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
9874 9874
9875 <para> 9875 <para>
9876 This variable is used with recipes that inherit the 9876 This variable is used with recipes that inherit the
9877 <link linkend='ref-classes-qmake*'><filename>qmake_base</filename></link> 9877 <filename>qmake_base</filename>
9878 class or other classes that inherit 9878 class or other classes that inherit
9879 <filename>qmake_base</filename>. 9879 <filename>qmake_base</filename>.
9880 </para> 9880 </para>
@@ -10814,7 +10814,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
10814 <glossdef> 10814 <glossdef>
10815 <para role="glossdeffirst"> 10815 <para role="glossdeffirst">
10816<!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> 10816<!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> -->
10817 The toolchain binary prefix used for nativesdk recipes. 10817 The toolchain binary prefix used for
10818 <filename>nativesdk</filename> recipes.
10818 The OpenEmbedded build system uses the 10819 The OpenEmbedded build system uses the
10819 <filename>SDK_PREFIX</filename> value to set the 10820 <filename>SDK_PREFIX</filename> value to set the
10820 <link linkend='var-TARGET_PREFIX'><filename>TARGET_PREFIX</filename></link> 10821 <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 @@
1378 <literallayout class='monospaced'> 1378 <literallayout class='monospaced'>
1379 COMMERCIAL_AUDIO_PLUGINS ?= "" 1379 COMMERCIAL_AUDIO_PLUGINS ?= ""
1380 COMMERCIAL_VIDEO_PLUGINS ?= "" 1380 COMMERCIAL_VIDEO_PLUGINS ?= ""
1381 COMMERCIAL_QT = ""
1382 </literallayout> 1381 </literallayout>
1383 If you want to enable these components, you can do so by making sure you have 1382 If you want to enable these components, you can do so by making sure you have
1384 statements similar to the following 1383 statements similar to the following
@@ -1388,7 +1387,6 @@
1388 gst-plugins-ugly-mpegaudioparse" 1387 gst-plugins-ugly-mpegaudioparse"
1389 COMMERCIAL_VIDEO_PLUGINS = "gst-plugins-ugly-mpeg2dec \ 1388 COMMERCIAL_VIDEO_PLUGINS = "gst-plugins-ugly-mpeg2dec \
1390 gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" 1389 gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
1391 COMMERCIAL_QT ?= "qmmp"
1392 LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_gst-plugins-bad commercial_qmmp" 1390 LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_gst-plugins-bad commercial_qmmp"
1393 </literallayout> 1391 </literallayout>
1394 Of course, you could also create a matching whitelist 1392 Of course, you could also create a matching whitelist
@@ -1406,9 +1404,8 @@
1406 Specifying audio and video plug-ins as part of the 1404 Specifying audio and video plug-ins as part of the
1407 <filename>COMMERCIAL_AUDIO_PLUGINS</filename> and 1405 <filename>COMMERCIAL_AUDIO_PLUGINS</filename> and
1408 <filename>COMMERCIAL_VIDEO_PLUGINS</filename> statements 1406 <filename>COMMERCIAL_VIDEO_PLUGINS</filename> statements
1409 or commercial Qt components as part of 1407 (along with the enabling
1410 the <filename>COMMERCIAL_QT</filename> statement (along 1408 <filename>LICENSE_FLAGS_WHITELIST</filename>) includes the
1411 with the enabling <filename>LICENSE_FLAGS_WHITELIST</filename>) includes the
1412 plug-ins or components into built images, thus adding 1409 plug-ins or components into built images, thus adding
1413 support for media formats or components. 1410 support for media formats or components.
1414 </para> 1411 </para>