From a7530267795dcd9a677dd5824966c0cf9b9ae29f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 12 Jul 2010 10:01:30 +0200
Subject: [PATCH] Documentation: Fix whitespace of merge request 138.
---
doc/examples/doc_src_plugins.qdoc | 2 +-
doc/qtcreator.qdoc | 76 +++++++++++++++----------------
2 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/doc/examples/doc_src_plugins.qdoc b/doc/examples/doc_src_plugins.qdoc
index 08ef053170a..efcdab026c2 100644
--- a/doc/examples/doc_src_plugins.qdoc
+++ b/doc/examples/doc_src_plugins.qdoc
@@ -84,7 +84,7 @@ sudo cp -R /usr/local/qwt-5.2.1/lib/* \
//! [5]
cd /Developer/Applications/Qt/Qt\ Creator.app/Contents/MacOS/designer
-sudo install_name_tool -change
+sudo install_name_tool -change
QtCore.framework/Versions/4/QtCore \
@executable_path/../Frameworks/libQtCore.4.dylib \
libqwt_designer_plugin.dylib
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 75d43602cd8..564be2ee37a 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -4496,7 +4496,7 @@
around as described in the link provided below:
\l http://bugreports.qt.nokia.com/browse/QTBUG-4962.
- \endtable
+ \endtable
\section1 Setting the Symbol Server in Windows
@@ -6301,59 +6301,59 @@
located under \c {%SDK%\qt}. Therefore, it fetches plugins from the following folder:
\c {%SDK%\qt\plugins\designer}. To check which plugins were loaded successfully and which
failed, choose \gui{Help > About Plugins}.
-
+
\section1 Additional Steps needed on Mac
-
+
Due to the fact that Qt Creator uses its own set of Qt Libraries located in the bundle,
you need to reconfigure additional designer plugins you want to use with Qt Creator.
Read \l{http://doc.qt.nokia.com/4.6/deployment-mac.html}{Deploying an Application on Mac OS X}
to get general information on deploying on Mac.
-
- The necessary steps of this process are shown by taking version 5.2.1 of the
+
+ The necessary steps of this process are shown by taking version 5.2.1 of the
\l{http://qwt.sourceforge.net/}{Qwt - Qt Widgets for Technical Applications} library as a sample.
-
+
In order to check the paths used in the Qwt library use the \c otool:
\snippet examples/doc_src_plugins.qdoc 0
-
+
Here is what the output looks like for Qwt 5.2.1
-
+
\snippet examples/doc_src_plugins.qdoc 1
-
- This tells us two things:
-
- \list 1
-
- \o The plugin itself uses the following Qt core libraries:
- QtDesigner, QtScript, QtXml, QtGui and QtCore
-
- \o The plugin also uses \c libqwt.5.dylib
-
- \endlist
-
- This means that you need to copy the designer plugin \c {libqwt_designer_plugin.dylib}
- and the Qwt library files \c {libqwt.*.dylib} to the following locations respectively:
-
- \list
- \o \c {libqwt_designer_plugin.dylib} needs to be copied to \c {QtCreator.app/Contents/MacOS/designer}
- \o and the files \c {libqwt.*.dylib} need to be copied to \c {QtCreator.app/Contents/Frameworks}
- \endlist
-
- This can be done by the following commands:
-
+
+ This tells us two things:
+
+ \list 1
+
+ \o The plugin itself uses the following Qt core libraries:
+ QtDesigner, QtScript, QtXml, QtGui and QtCore
+
+ \o The plugin also uses \c libqwt.5.dylib
+
+ \endlist
+
+ This means that you need to copy the designer plugin \c {libqwt_designer_plugin.dylib}
+ and the Qwt library files \c {libqwt.*.dylib} to the following locations respectively:
+
+ \list
+ \o \c {libqwt_designer_plugin.dylib} needs to be copied to \c {QtCreator.app/Contents/MacOS/designer}
+ \o and the files \c {libqwt.*.dylib} need to be copied to \c {QtCreator.app/Contents/Frameworks}
+ \endlist
+
+ This can be done by the following commands:
+
\snippet examples/doc_src_plugins.qdoc 4
- We also need to check the libraries that are used by the Qwt library itself. We do this
- again with the \c otool:
-
+ We also need to check the libraries that are used by the Qwt library itself. We do this
+ again with the \c otool:
+
\snippet examples/doc_src_plugins.qdoc 2
- which returns the following output:
-
+ which returns the following output:
+
\snippet examples/doc_src_plugins.qdoc 3
-
- Now we have all the information necessary to fix the references of the used libraries
- using the \c install_name_tool as:
+
+ Now we have all the information necessary to fix the references of the used libraries
+ using the \c install_name_tool as:
\snippet examples/doc_src_plugins.qdoc 5
--
GitLab