diff --git a/demos/qtdemo/examplecontent.cpp b/demos/qtdemo/examplecontent.cpp
index e688ca1d57a5962a0e1cec698b1a67c01daedcd6..874a84c020c5494edc136b96adb10b2d7770b547 100644
--- a/demos/qtdemo/examplecontent.cpp
+++ b/demos/qtdemo/examplecontent.cpp
@@ -93,7 +93,7 @@ QString ExampleContent::loadDescription()
if (paragraphs.length() < 1 && Colors::verbose)
qDebug() << "- ExampleContent::loadDescription(): Could not load description:"
<< MenuManager::instance()->info[this->name]["docfile"];
- QString description = Colors::contentColor + QLatin1String("");
+ QString description = Colors::contentColor + QLatin1String("");
//QLatin1String("Could not load description. Ensure that the documentation for Qt is built."); // QTBUG-12522: If there is no description why show an error to the user when qDebug above communications the issue (if it is indeed an issue at all) when demos are built?
for (int p = 0; p < int(paragraphs.length()); ++p) {
description = this->extractTextFromParagraph(paragraphs.item(p));
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp
index fb0d604d8e3ce32078f6c4b012575d67d5b098ee..0a1a3326fe13be6b011d8ce081f4645475f8c519 100644
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
@@ -344,7 +344,7 @@ void MenuManager::launchExample(const QString &name)
#ifdef Q_OS_WIN
//make sure it finds the dlls on windows
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- env.insert(QLatin1String("PATH"), QLibraryInfo::location(QLibraryInfo::BinariesPath)
+ env.insert(QLatin1String("PATH"), QLibraryInfo::location(QLibraryInfo::BinariesPath)
+ QLatin1Char(';') + env.value(QLatin1String("Path")));
process->setProcessEnvironment(env);
#endif
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 766e31450dc8b1375db59afd4a3d39d43acf9902..dadfb52c97aea6a82fc8b528ec18b578be57f163 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -276,5 +276,5 @@
<example filename="qobjectxmlmodel" name="QObjectXmlModel" />
<example filename="filetree" name="File Tree" />
<example filename="schema" name="XML Schema Validation" />
- </category>
+ </category>
</categories>
diff --git a/doc/src/development/activeqt-idc.qdoc b/doc/src/development/activeqt-idc.qdoc
index 73318aaa10ad9dcf4cd04f1ea1555994592a3731..1ebd4d141c62db88d191b4c6bd3ddd0cf30ce919 100644
--- a/doc/src/development/activeqt-idc.qdoc
+++ b/doc/src/development/activeqt-idc.qdoc
@@ -25,7 +25,7 @@
**
****************************************************************************/
-/*!
+/*!
\page activeqt-idc.html
\title IDC - The Interface Description Compiler (ActiveQt)
@@ -34,7 +34,7 @@
\keyword idc
The IDC tool is part of the ActiveQt build system and makes
- it possible to turn any Qt binary into a full COM object server
+ it possible to turn any Qt binary into a full COM object server
with only a few lines of code.
IDC understands the following command line parameters:
@@ -62,7 +62,7 @@
\endtable
It is usually never necessary to invoke IDC manually, as the \c
- qmake build system takes care of adding the required post
+ qmake build system takes care of adding the required post
processing steps to the build process. See the \l{ActiveQt}
documentation for details.
*/
diff --git a/doc/src/development/activeqt-testcon.qdoc b/doc/src/development/activeqt-testcon.qdoc
index 411f1c972607232811c1c5f2280c9ba878f281bd..51c57481c3ac7553da6880403cd4a0c4eacf1da3 100644
--- a/doc/src/development/activeqt-testcon.qdoc
+++ b/doc/src/development/activeqt-testcon.qdoc
@@ -25,7 +25,7 @@
**
****************************************************************************/
-/*!
+/*!
\page activeqt-testcon.html
\title testcon - An ActiveX Test Container (ActiveQt)
@@ -39,17 +39,17 @@
will log information about events and property changes as well
as debug output in the log window.
- Parts of the code use internals of the Qt meta object and ActiveQt
+ Parts of the code use internals of the Qt meta object and ActiveQt
framework and are not recommended to be used in application code.
- Use the application to view the slots, signals and porperties
- available through the QAxWidget class when instantiated with a
+ Use the application to view the slots, signals and porperties
+ available through the QAxWidget class when instantiated with a
certain ActiveX, and to test ActiveX controls you implement or
want to use in your Qt application.
- The application can load and execute script files in JavaScript,
- VBScript, Perl and Python (if installed) to automate the controls
- loaded. Example script files using the QAxWidget2 class are available
+ The application can load and execute script files in JavaScript,
+ VBScript, Perl and Python (if installed) to automate the controls
+ loaded. Example script files using the QAxWidget2 class are available
in the \c scripts subdirectory.
Note that the qmake project of this example includes a resource file
diff --git a/doc/src/development/debug.qdoc b/doc/src/development/debug.qdoc
index 4f78b621c36e8f1416fe4473a1e45ab686f70921..2538d0b7ea2d438f6576d0301fce3e8fafc9bf4b 100644
--- a/doc/src/development/debug.qdoc
+++ b/doc/src/development/debug.qdoc
@@ -47,9 +47,9 @@
\section3 Debugging With/Without Frameworks
The basic stuff you need to know about debug libraries and
- frameworks is found at developer.apple.com in:
+ frameworks is found at developer.apple.com in:
\l{http://developer.apple.com/technotes/tn2004/tn2124.html#SECDEBUGLIB}
- {Apple Technical Note TN2124}.
+ {Apple Technical Note TN2124}.
When you build Qt, frameworks are built by default, and inside the
framework you will find both a release and a debug version (e.g.,
diff --git a/doc/src/development/moc.qdoc b/doc/src/development/moc.qdoc
index 86a766b53b860cd01f1d5e0cacc5bfb4356c2cbc..e172c868f2316f3178181d7f2a278261731a092d 100644
--- a/doc/src/development/moc.qdoc
+++ b/doc/src/development/moc.qdoc
@@ -219,7 +219,7 @@
\row
\li \c{-Fdir}
-
+
\li Mac OS X. Add the framework directory \c{dir} to the head of
the list of directories to be searched for header files. These
directories are interleaved with those specified by -I options
diff --git a/doc/src/development/qmsdev.qdoc b/doc/src/development/qmsdev.qdoc
index 02cbeaac7aa6838cde5a916db524f411cf8318eb..c6ee6a77c7d9aa679d3b0f0bbab3f6117da8e2f5 100644
--- a/doc/src/development/qmsdev.qdoc
+++ b/doc/src/development/qmsdev.qdoc
@@ -25,19 +25,19 @@
**
****************************************************************************/
-/* NOT DOCUMENTED !
+/* NOT DOCUMENTED !
\page qmsdev.html
\title The QMsDev Plugin
The Visual Studio Integration Plugin is currently available only to users of
Visual Studio 6. It offers simple ways of doing common tasks when writing a
- Qt application.
+ Qt application.
\tableofcontents
\section1 How to install the Visual Studio Integration Plugin
-
+
When you install Qt, the integration plugin should be installed for you,
however, sometimes this does not happen, so to install the integration
plugin manually just carry out the following steps.
@@ -52,7 +52,7 @@
Now the integration plugin should be installed. If this doesn't
work, then contact Qt technical support giving details of
what went wrong.
-
+
\section1 How to uninstall the Visual Studio Integration Plugin
When you want to uninstall the integration plugin, just carry out the
@@ -64,7 +64,7 @@
\endlist
\section1 What can the Visual Studio Integration Plugin do?
-
+
The integration plugin adds the following options to Visual Studio:
\list
@@ -78,7 +78,7 @@
\endlist
\section2 Using the 'New Qt Project' button
-
+
The 'New Qt Project' button allows you to create a simple Qt project
ready for development. Simply fill in the form and if you select
'Dialog' or 'Main Window' without MDI support then it will
@@ -142,7 +142,7 @@
The 'Add MOC' button will add in the custom build step for the selected file
so that it creates any needed MOC files and it will add these generated
files to the project. All you need to do to use it is click on a file that
- has Q_OBJECT and click the button.
+ has Q_OBJECT and click the button.
You only need to use this button if you added a file that has
Q_OBJECT in it by hand, you don't need to use this if you used any
diff --git a/doc/src/diagrams/contentspropagation/customwidget.py b/doc/src/diagrams/contentspropagation/customwidget.py
index f64a2ab6be616024df33b9071241208ef67c0125..0ddf2b433ed5579b08b1cdbeadb137c9d7245ef7 100755
--- a/doc/src/diagrams/contentspropagation/customwidget.py
+++ b/doc/src/diagrams/contentspropagation/customwidget.py
@@ -47,7 +47,7 @@ from PyQt4.QtGui import *
class CustomWidget(QWidget):
def __init__(self, parent, fake = False):
-
+
QWidget.__init__(self, parent)
gradient = QLinearGradient(QPointF(0, 0), QPointF(100.0, 100.0))
baseColor = QColor(0xa6, 0xce, 0x39, 0x7f)
@@ -56,7 +56,7 @@ class CustomWidget(QWidget):
self.brush = QBrush(gradient)
self.fake = fake
self.fakeBrush = QBrush(Qt.red, Qt.DiagCrossPattern)
-
+
qtPath = QPainterPath()
qtPath.setFillRule(Qt.OddEvenFill)
qtPath.moveTo(-45.0, -20.0)
@@ -81,7 +81,7 @@ class CustomWidget(QWidget):
self.path = qtPath
def paintEvent(self, event):
-
+
painter = QPainter()
painter.begin(self)
painter.setRenderHint(QPainter.Antialiasing)
@@ -92,13 +92,13 @@ class CustomWidget(QWidget):
painter.translate(60, 60)
painter.drawPath(self.path)
painter.end()
-
+
def sizeHint(self):
-
+
return QSize(120, 120)
-
+
def minimumSizeHint(self):
-
+
return QSize(120, 120)
@@ -108,16 +108,16 @@ if __name__ == "__main__":
qt = sys.argv[1]
except IndexError:
qt = "4.1"
-
+
if qt != "4.0" and qt != "4.1":
sys.stderr.write("Usage: %s [4.0|4.1]\n" % sys.argv[0])
sys.exit(1)
-
+
app = QApplication(sys.argv)
exec_dir = os.path.split(os.path.abspath(sys.argv[0]))[0]
label = QLabel()
label.setPixmap(QPixmap(os.path.join(exec_dir, "background.png")))
-
+
layout = QGridLayout()
label.setLayout(layout)
if qt == "4.0":
@@ -131,7 +131,7 @@ if __name__ == "__main__":
caption.setAutoFillBackground(True)
caption.setMargin(2)
layout.addWidget(caption, 1, 0, Qt.AlignCenter | Qt.AlignTop)
-
+
if qt == "4.0":
contentsWidget = CustomWidget(label)
contentsWidget.setAttribute(Qt.WA_ContentsPropagated, True)
@@ -147,7 +147,7 @@ if __name__ == "__main__":
caption.setAutoFillBackground(True)
caption.setMargin(2)
layout.addWidget(caption, 1, 1, Qt.AlignCenter | Qt.AlignTop)
-
+
if qt == "4.0":
noBackgroundWidget = CustomWidget(label, fake = True)
noBackgroundWidget.setAttribute(Qt.WA_NoBackground, True)
@@ -164,12 +164,12 @@ if __name__ == "__main__":
caption.setAutoFillBackground(True)
caption.setMargin(2)
layout.addWidget(caption, 1, 2, Qt.AlignCenter | Qt.AlignTop)
-
+
if qt == "4.0":
label.setWindowTitle("Qt 4.0: Painting Custom Widgets")
elif qt == "4.1":
label.setWindowTitle("Qt 4.1: Painting Custom Widgets")
-
+
label.resize(404, 160)
label.show()
sys.exit(app.exec_())
diff --git a/doc/src/diagrams/contentspropagation/standardwidgets.py b/doc/src/diagrams/contentspropagation/standardwidgets.py
index cbaa69bf8982f53c1993cfef9b2e0c7cd3542bc6..e832ce29aa1923400c590b1981ea27797d678575 100755
--- a/doc/src/diagrams/contentspropagation/standardwidgets.py
+++ b/doc/src/diagrams/contentspropagation/standardwidgets.py
@@ -51,7 +51,7 @@ def createGroupBox(parent, attributes = None, fill = False, fake = False):
backgroundLayout = QVBoxLayout()
backgroundLayout.setMargin(4)
background.setLayout(backgroundLayout)
-
+
groupBox = QGroupBox("&Options")
layout = QGridLayout()
groupBox.setLayout(layout)
@@ -61,30 +61,30 @@ def createGroupBox(parent, attributes = None, fill = False, fake = False):
checkedBox.setChecked(True)
layout.addWidget(checkedBox, 1, 0)
layout.addWidget(QCheckBox("From &start of text"), 1, 1)
-
+
backgroundLayout.addWidget(groupBox)
-
+
if attributes:
for attr in attributes:
groupBox.setAttribute(attr, True)
if not fake:
background.setAttribute(attr, True)
-
+
groupBox.setAutoFillBackground(fill)
background.setAutoFillBackground(fill)
-
+
return background
-
+
class CustomWidget(QWidget):
def __init__(self, parent, fake = False):
-
+
QWidget.__init__(self, parent)
self.fake = fake
self.fakeBrush = QBrush(Qt.red, Qt.DiagCrossPattern)
def paintEvent(self, event):
-
+
painter = QPainter()
painter.begin(self)
painter.setRenderHint(QPainter.Antialiasing)
@@ -100,16 +100,16 @@ if __name__ == "__main__":
qt = sys.argv[1]
except IndexError:
qt = "4.1"
-
+
if qt != "4.0" and qt != "4.1":
sys.stderr.write("Usage: %s [4.0|4.1]\n" % sys.argv[0])
sys.exit(1)
-
+
app = QApplication(sys.argv)
exec_dir = os.path.split(os.path.abspath(sys.argv[0]))[0]
label = QLabel()
label.setPixmap(QPixmap(os.path.join(exec_dir, "lightbackground.png")))
-
+
layout = QGridLayout()
label.setLayout(layout)
if qt == "4.0":
@@ -123,7 +123,7 @@ if __name__ == "__main__":
caption.setAutoFillBackground(True)
caption.setMargin(2)
layout.addWidget(caption, 1, 0, Qt.AlignCenter | Qt.AlignTop)
-
+
if qt == "4.0":
contentsWidget = createGroupBox(label)
contentsWidget.setAttribute(Qt.WA_ContentsPropagated, True)
@@ -138,7 +138,7 @@ if __name__ == "__main__":
caption.setAutoFillBackground(True)
caption.setMargin(2)
layout.addWidget(caption, 1, 1, Qt.AlignCenter | Qt.AlignTop)
-
+
# if qt == "4.0":
# noBackgroundWidget = createGroupBox(
# label, attributes = [Qt.WA_NoBackground], fake = True)
@@ -155,7 +155,7 @@ if __name__ == "__main__":
# caption.setAutoFillBackground(True)
# caption.setMargin(2)
# layout.addWidget(caption, 3, 0, Qt.AlignCenter | Qt.AlignTop)
-#
+#
# if qt == "4.0":
# contentsNoBackgroundWidget = createGroupBox(
# label, attributes = [Qt.WA_ContentsPropagated, Qt.WA_NoBackground],
@@ -173,12 +173,12 @@ if __name__ == "__main__":
# caption.setAutoFillBackground(True)
# caption.setMargin(2)
# layout.addWidget(caption, 3, 1, Qt.AlignCenter | Qt.AlignTop)
-
+
if qt == "4.0":
label.setWindowTitle("Qt 4.0: Painting Standard Qt Widgets")
elif qt == "4.1":
label.setWindowTitle("Qt 4.1: Painting Standard Qt Widgets")
-
+
label.resize(480, 140)
label.show()
sys.exit(app.exec_())
diff --git a/doc/src/diagrams/dependencies.lout b/doc/src/diagrams/dependencies.lout
index 256f7de424a316f1e0c530f745f2c9a88abc209b..6f86beebf57c6df468d6988a156c4a77d53c7785 100644
--- a/doc/src/diagrams/dependencies.lout
+++ b/doc/src/diagrams/dependencies.lout
@@ -67,27 +67,27 @@ macro @GlibColour { rgb { 0.7 0.7 0.7 } }
@Rowe A { FREETYPE:: @Node paint { @OptionalColour } FreeType }
B { QTCORE:: @Node paint { @TTPurpleColour } QtCore }
D { XFIXES:: @Node paint { @OptionalColour } Xfixes }
- E { XEXT:: @Node paint { @DefaultColour } Xext }
+ E { XEXT:: @Node paint { @DefaultColour } Xext }
G { SM:: @Node paint { @SMColour } SM }
@Rowf B { PTHREAD:: @Node paint { @PthreadColour } pthread }
C { GLIB:: @Node paint { @GlibColour } Glib }
E { X:: @Node paint { @DefaultColour } X11 }
G { ICE:: @Node paint { @SMColour } ICE }
@Rowg F {
- @Tbl
- font { -2p }
- margin { 0.15f }
- cmarginabove { 0c }
- iv { top }
- bformat { @Cell A | @Cell B | @Cell C }
- cformat { @Cell A | @Cell B | @Cell C }
- aformat { @StartHSpan @Cell A | @HSpan | @HSpan }
- {
- @Rowb A { C:: @BNode {} } B { D:: @BNode {} }
- C { some configurations only }
+ @Tbl
+ font { -2p }
+ margin { 0.15f }
+ cmarginabove { 0c }
+ iv { top }
+ bformat { @Cell A | @Cell B | @Cell C }
+ cformat { @Cell A | @Cell B | @Cell C }
+ aformat { @StartHSpan @Cell A | @HSpan | @HSpan }
+ {
+ @Rowb A { C:: @BNode {} } B { D:: @BNode {} }
+ C { some configurations only }
@Rowb B { * } C { Xt intrinsics only }
- }
- }
+ }
+ }
}
//
@VHVCurveArrow from { QTGUI } to { XINERAMA } pathstyle { dotted }
diff --git a/doc/src/diagrams/programs/mdiarea.py b/doc/src/diagrams/programs/mdiarea.py
index c1db005df11425ed483b1053f87d97c479f171c3..8566af9af28933864ba54b7e4c573ecda4c1ba85 100644
--- a/doc/src/diagrams/programs/mdiarea.py
+++ b/doc/src/diagrams/programs/mdiarea.py
@@ -49,12 +49,12 @@ from PyQt4.QtGui import QApplication, QColor, QIcon, QLabel, QMdiArea, QPixmap,
class Changer:
def __init__(self, mdiArea):
-
+
self.mdiArea = mdiArea
self.state = 0
-
+
def change(self):
-
+
if self.state == 0:
self.mdiArea.cascadeSubWindows()
self.mdiArea.setWindowTitle("Cascade")
@@ -71,9 +71,9 @@ if __name__ == "__main__":
pixmap.fill(QColor(0, 0, 0, 0))
icon = QIcon(pixmap)
app.setWindowIcon(icon)
-
+
mdiArea = QMdiArea()
-
+
textEdit = QTextEdit()
textEdit.setPlainText("Qt Quarterly is a paper-based newsletter "
"exclusively available to Qt customers. Every "
@@ -83,27 +83,27 @@ if __name__ == "__main__":
"written by Qt experts.")
textWindow = mdiArea.addSubWindow(textEdit)
textWindow.setWindowTitle("A Text Editor")
-
+
label = QLabel()
label.setPixmap(QPixmap("../../images/qt-logo.png"))
labelWindow = mdiArea.addSubWindow(label)
labelWindow.setWindowTitle("A Label")
-
+
items = (("Henry", 23), ("Bill", 56), ("Susan", 19), ("Jane", 47))
table = QTableWidget(len(items), 2)
-
+
for i in range(len(items)):
name, age = items[i]
item = QTableWidgetItem(name)
table.setItem(i, 0, item)
item = QTableWidgetItem(str(age))
table.setItem(i, 1, item)
-
+
tableWindow = mdiArea.addSubWindow(table)
tableWindow.setWindowTitle("A Table Widget")
-
+
mdiArea.show()
-
+
changer = Changer(mdiArea)
button = QPushButton("Cascade")
button.connect(button, SIGNAL("clicked()"), changer.change)
diff --git a/doc/src/diagrams/programs/qpen-dashpattern.py b/doc/src/diagrams/programs/qpen-dashpattern.py
index 24034dbc5f1b78264fc2e2ffd25ce78d359e75cc..7fb262099077f29d840975ddc5cb2d19e1687bfc 100644
--- a/doc/src/diagrams/programs/qpen-dashpattern.py
+++ b/doc/src/diagrams/programs/qpen-dashpattern.py
@@ -48,63 +48,63 @@ from PyQt4.QtSvg import QSvgGenerator
if __name__ == "__main__":
app = QApplication(sys.argv)
-
+
#device = QSvgGenerator()
#device.setFileName("qpen-dashpattern.svg")
#device.setSize(QSize(216, 144))
#device.setResolution(72)
-
+
device = QImage(192, 144, QImage.Format_ARGB32)
device.fill(qRgba(0, 0, 0, 0))
-
+
#resolution = device.resolution() # dpi
#dpp = resolution / 72.0
-
+
p = QPainter()
p.begin(device)
-
+
width = 8
-
+
pen = QPen()
pen.setWidth(width)
pen.setDashPattern([4, 2])
pen.setCapStyle(Qt.FlatCap)
-
+
faded_pen = QPen()
faded_pen.setWidth(width)
faded_pen.setDashPattern([4, 2])
faded_pen.setColor(QColor(160, 160, 160))
faded_pen.setCapStyle(Qt.FlatCap)
-
+
font = QFont("Monospace")
font.setPointSize(12)
p.setFont(font)
p.setBrush(QColor(160, 0, 0))
-
+
for x in range(-6, 9):
-
+
if x % 4 == 0:
length = 6
else:
length = 2
-
+
p.drawLine(64 + x * width, 4, 64 + x * width, 4 + length)
p.drawLine(64 + x * width, 136, 64 + x * width, 136 - length)
-
+
offsets = (0, 2, 3.5, 4, 5, 6)
for i in range(len(offsets)):
-
+
offset = offsets[i]
pen.setDashOffset(offset)
-
+
p.setPen(faded_pen)
p.drawLine(64 - offset * width, 20 + (i * 20), 64, 20 + (i * 20))
-
+
p.setPen(pen)
p.drawLine(64, 20 + (i * 20), 128, 20 + (i * 20))
-
+
p.drawText(150, 25 + (i * 20), str(offset))
-
+
p.end()
device.save("qpen-dashpattern.png")
sys.exit()
diff --git a/doc/src/frameworks-technologies/desktop-integration.qdoc b/doc/src/frameworks-technologies/desktop-integration.qdoc
index f63e907bdd8f4463e50b9c9ea88bc5685f6612a1..68fbc22e0f05dd0b6afd4d7fc34d51b7e4fb4e5d 100644
--- a/doc/src/frameworks-technologies/desktop-integration.qdoc
+++ b/doc/src/frameworks-technologies/desktop-integration.qdoc
@@ -29,7 +29,7 @@
\page desktop-integration.html
\title Desktop Integration
\brief Integrating with the user's desktop environment.
-
+
\ingroup best-practices
\ingroup qt-gui-concepts
diff --git a/doc/src/frameworks-technologies/unicode.qdoc b/doc/src/frameworks-technologies/unicode.qdoc
index e5a3ba5c67ad831a057189a06ffb62592db53604..c6bc4bf44adda249597ba16ecf599e2da196667a 100644
--- a/doc/src/frameworks-technologies/unicode.qdoc
+++ b/doc/src/frameworks-technologies/unicode.qdoc
@@ -60,7 +60,7 @@
about rendering text, see the \l{Rich Text Processing} overview, and if
your string data is in XML, see the \l{XML Processing} overview.
- \annotatedlist string-processing
+ \annotatedlist string-processing
\section1 Information about Unicode on the Web
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index f5aba16b456e60c5e346a787291b0ea0ef51f8e3..7c600065bb8c03a57c6c470c693a8b96ae149b65 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -30,7 +30,7 @@
\title Known Issues
\brief Links to online resources stating known issues in this Qt version at the time of release.
- \list
+ \list
\li An up-to-date list of known issues can be found at the \l{Qt Bug Tracker}.
\li An overview of known issues may also be found at: \l{http://qt.gitorious.org/qt/pages/QtKnownIssues}
{Known Issues Wiki}.
diff --git a/doc/src/graphics.qdoc b/doc/src/graphics.qdoc
index bae96475f5bf99893d159d82c52f45eedc968a25..8a2306cc80399f2be9fe8755905dd855f88bf58a 100644
--- a/doc/src/graphics.qdoc
+++ b/doc/src/graphics.qdoc
@@ -51,7 +51,7 @@ and a complete feature set.
\sa {Paint System}
-\list
+\list
\li \l {Paint System}{Paint System} - Overview over the QPainter
classes and architecture.
@@ -102,8 +102,8 @@ desktop platforms and almost every mobile and embedded platform. The
Qt library contains a number of classes that help users integrate
OpenGL into their applications.
-\list
-
+\list
+
\li \l {qtgui-index.html#opengl-and-opengl-es-integration}{OpenGL
in Qt GUI} - An overview of how OpenGL integrates with the \l{Qt GUI}
module.
@@ -148,7 +148,7 @@ file, and use QQuickView to run it.
\li \l {Scene Graph and Rendering} - Breakdown of the rendering of
each frame.
-\endlist
+\endlist
Qt Quick can be mixed with raw OpenGL rendering by connecting to the
signals \l QQuickWindow::beforeRendering() or \l
diff --git a/doc/src/howtos/exceptionsafety.qdoc b/doc/src/howtos/exceptionsafety.qdoc
index 9c2136c885f32e7f46410fab82d7c888c6972c2c..37ec0dd9bb385e71acaef81e91bfd211ace72530 100644
--- a/doc/src/howtos/exceptionsafety.qdoc
+++ b/doc/src/howtos/exceptionsafety.qdoc
@@ -48,7 +48,7 @@
\section1 Exception safe modules
\section2 Containers
-
+
Qt's \l{container classes} are generally exception neutral. They pass any
exception that happens within their contained type \c T to the user
while keeping their internal state valid.
@@ -107,7 +107,7 @@
\section1 Recovering from exceptions
Currently, the only supported use case for recovering from exceptions thrown
- within Qt (for example due to out of memory) is to exit the event loop and do
+ within Qt (for example due to out of memory) is to exit the event loop and do
some cleanup before exiting the application.
Typical use case:
diff --git a/doc/src/howtos/session.qdoc b/doc/src/howtos/session.qdoc
index afe0a2311145aa939c59ed3a86f5063aa06b57a8..9168f2527346eac81db743c675b0e8921654dfa6 100644
--- a/doc/src/howtos/session.qdoc
+++ b/doc/src/howtos/session.qdoc
@@ -47,7 +47,7 @@
session may include applications running on different computers and
may span multiple displays.
- \section1 Shutting a Session Down
+ \section1 Shutting a Session Down
A session is shut down by the session manager, usually on behalf of
the user when they want to log out. A system might also perform an
@@ -73,7 +73,7 @@
X11 has supported complete session management since X11R6.
- \section1 Getting Session Management to Work with Qt
+ \section1 Getting Session Management to Work with Qt
Start by reimplementing QApplication::commitData() to
enable your application to take part in the graceful logout process. If
@@ -105,12 +105,12 @@
\b{Important:} In order to allow the window manager to
restore window attributes such as stacking order or geometry
- information, you must identify your top level widgets with
+ information, you must identify your top level widgets with
unique application-wide object names (see QObject::setObjectName()). When
restoring the application, you must ensure that all restored
top level widgets are given the same unique names they had before.
- \section1 Testing and Debugging Session Management
+ \section1 Testing and Debugging Session Management
Session management support on Mac OS X and Windows is fairly limited
due to the lack of this functionality in the operating system
diff --git a/doc/src/howtos/sharedlibrary.qdoc b/doc/src/howtos/sharedlibrary.qdoc
index aca805566ba7192c767d0f48006c3deb27c84fb4..7d1fc53d8f8e9b2058e9067773ee299fb4815216 100644
--- a/doc/src/howtos/sharedlibrary.qdoc
+++ b/doc/src/howtos/sharedlibrary.qdoc
@@ -110,9 +110,9 @@
class MyDevice {
private:
- FOOTRONICS_DEVICE_HANDLE handle;
+ FOOTRONICS_DEVICE_HANDLE handle;
};
- \endcode
+ \endcode
A similar situation arises with forms created by Qt Designer when using
aggregation or multiple inheritance:
@@ -122,9 +122,9 @@
class MyWidget : public QWidget {
private:
- Ui::MyWidget m_ui;
+ Ui::MyWidget m_ui;
};
- \endcode
+ \endcode
When deploying the library, there should be no dependency to the internal
headers \c{footronics/device.h} or \c{ui_widget.h}.
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index 3b8c4984356873d8f70f67ad7acaa238826b007b..d7c7de92c1d921473fff3c849af63fca71a44962 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -41,18 +41,18 @@
\li Oracle and Java are registered trademarks of Oracle and/or its affiliates.
Other names may be trademarks of their respective owners.
\li Linux is a \reg trademark of Linus Torvalds in the United States, other
- countries or both.
+ countries or both.
\li Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc.,
- registered in the U.S. and other countries.
+ registered in the U.S. and other countries.
\li Microsoft, Windows, Windows NT, XP, Windows Vista, Visual Studio, ActiveX
and the Windows logo are \reg trademarks of Microsoft Corporation in the
United States, other countries, or both.
\li Motif is a registered trademark of The Open Group in the United States,
- other countries, or both.
+ other countries, or both.
\li OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States
- and other countries.
+ and other countries.
\li UNIX is a registered trademark of The Open Group in the United States
- and other countries.
+ and other countries.
\li All other company, product, or service names may be trademarks or
service marks of others and are the property of their respective owners.
The use of the word partner does not imply a partnership relationship
diff --git a/doc/src/platforms/emb-opengl.qdocinc b/doc/src/platforms/emb-opengl.qdocinc
index 421879fdfd6c82dd4e38d6b60e30f2bb54259525..7a46c5852f929cb20b5765bf9fd996f2b2cf7e02 100644
--- a/doc/src/platforms/emb-opengl.qdocinc
+++ b/doc/src/platforms/emb-opengl.qdocinc
@@ -33,9 +33,9 @@ To translate QPainter operations into OpenGL ES calls (there are actually
two subclasses, one for OpenGL/ES 1.1 and another for OpenGL/ES 2.0), Qt
uses a subclass of QPaintEngine. This specialized paint engine can be used
to improve 2D rendering performance on appropriate hardware. It can also
-overlay controls and decorations onto 3D scenes drawn using OpenGL.
+overlay controls and decorations onto 3D scenes drawn using OpenGL.
-\tableofcontents
+\tableofcontents
\section1 Using OpenGL ES with Qt
To use OpenGL-enabled widgets in a Qt for Embedded application, all that is
@@ -74,7 +74,7 @@ application requires them.
\note OpenGL ES 2.X does not support PBuffers, so QGLPixelBuffer will not
work. In this case, QGLFramebufferObject should be used instead. However,
OpenGL ES 1.X does not support Framebuffer objects, with the exception of
-some OpenGL ES 1.X extensions. In this case, please use QGLPixelBuffer.
+some OpenGL ES 1.X extensions. In this case, please use QGLPixelBuffer.
\note On most embedded hardware, the OpenGL implementation is
actually \l{http://www.khronos.org/opengles/1_X/}{OpenGL/ES 1.1} or
diff --git a/doc/src/platforms/wince-signing.qdoc b/doc/src/platforms/wince-signing.qdoc
index 0a357a1e4e1ed1dfe0251b4e64110b0744047f5b..c334f958f58278c34cae8acdae283a49e1b0f4e9 100644
--- a/doc/src/platforms/wince-signing.qdoc
+++ b/doc/src/platforms/wince-signing.qdoc
@@ -35,11 +35,11 @@
Windows CE provides a security mechanism to ask the user to confirm
that they want to use an application/library that is unknown to the
-system. This process gets repeated for each dependency of an
+system. This process gets repeated for each dependency of an
application, meaning each library the application links to, which is
not recognized yet.
-To simplify this process you can use signatures and certificates. A
+To simplify this process you can use signatures and certificates. A
certificate gets installed on the device and each file which is
signed with the according certificate can be launched without the
security warning.
@@ -50,7 +50,7 @@ location of the .pfx file and qmake adds the signing step to the
build rules.
If you need to select a separate signature for a specific project,
-or you only want to sign a single project, you can use the
+or you only want to sign a single project, you can use the
"SIGNATURE_FILE = foo.pfx" rule inside the project file.
The above described rules apply for command line makefiles as well as
diff --git a/doc/src/snippets/accessibilityfactorysnippet.cpp b/doc/src/snippets/accessibilityfactorysnippet.cpp
index b23d4232611247123ad303ddc3c34042f6da4745..a6d6732ddf9fc242cdb1dfe11bba42a4d6d70931 100644
--- a/doc/src/snippets/accessibilityfactorysnippet.cpp
+++ b/doc/src/snippets/accessibilityfactorysnippet.cpp
@@ -47,7 +47,7 @@ QAccessibleInterface *sliderFactory(const QString &classname, QObject *object)
if (classname == QLatin1String("QSlider") && object && object->isWidgetType())
interface = new QAccessibleSlider(static_cast<QWidget *>(object));
-
+
return interface;
}
diff --git a/doc/src/snippets/accessibilityslidersnippet.cpp b/doc/src/snippets/accessibilityslidersnippet.cpp
index 9b445c2e7fa1401efb575e9e2c8f720fc61c672f..96ac4b9202d6e5b1125f2e2a30edb989b14f4dc3 100644
--- a/doc/src/snippets/accessibilityslidersnippet.cpp
+++ b/doc/src/snippets/accessibilityslidersnippet.cpp
@@ -199,7 +199,7 @@ static const char * const actionTexts[][5] =
QString QAccessibleSlider::actionText(int action, Text text, int child) const
{
if (action != Press || child < 1 || child > 2)
- return QAccessibleAbstractSlider::actionText(action, text, child);
+ return QAccessibleAbstractSlider::actionText(action, text, child);
return actionTexts[child - 1][t];
}
@@ -208,7 +208,7 @@ bool QAccessibleSlider::doAction(int action, int child)
{
if (action != Press || child < 1 || child > 2)
return false;
-
+
if (child == PageLeft)
slider()->setValue(slider()->value() - slider()->pageStep());
else
diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp
index 76d8783b79671bd20fb396c19bd2e2b50761eeed..73bf7e1aa422bba2aa6fb04681ebb69c08c1b1bd 100644
--- a/doc/src/snippets/audio/main.cpp
+++ b/doc/src/snippets/audio/main.cpp
@@ -118,7 +118,7 @@ public slots:
break;
//![3]
- // Handle
+ // Handle
case QAudio::ActiveState:
// Handle active state...
break;
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
Window window;
window.show();
- return app.exec();
+ return app.exec();
}
diff --git a/doc/src/snippets/code/doc_src_fdl.qdoc b/doc/src/snippets/code/doc_src_fdl.qdoc
index b656e8052c86f3815e4e6a367b3185821e46e764..8ea9999cb2a1277a60985363d0ebfe8bd68b19f6 100644
--- a/doc/src/snippets/code/doc_src_fdl.qdoc
+++ b/doc/src/snippets/code/doc_src_fdl.qdoc
@@ -428,19 +428,19 @@ public wiki that anybody can edit is an example of such a server. A
"Massive Multiauthor Collaboration" (or "MMC") contained in the site
means any set of copyrightable works thus published on the MMC site.
-"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
-license published by Creative Commons Corporation, a not-for-profit
-corporation with a principal place of business in San Francisco,
-California, as well as future copyleft versions of that license
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
published by that same organization.
-"Incorporate" means to publish or republish a Document, in whole or in
+"Incorporate" means to publish or republish a Document, in whole or in
part, as part of another Document.
-An MMC is "eligible for relicensing" if it is licensed under this
-License, and if all works that were first published under this License
-somewhere other than this MMC, and subsequently incorporated in whole or
-in part into the MMC, (1) had no cover texts or invariant sections, and
+An MMC is "eligible for relicensing" if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole or
+in part into the MMC, (1) had no cover texts or invariant sections, and
(2) were thus incorporated prior to November 1, 2008.
The operator of an MMC Site may republish an MMC contained in the site
diff --git a/doc/src/snippets/code/doc_src_lgpl.qdoc b/doc/src/snippets/code/doc_src_lgpl.qdoc
index f33eda29babdd8a58ee22b39de02fc7da8980183..98e5360318bfeb9e6ed2b4895986ba06f6bc36be 100644
--- a/doc/src/snippets/code/doc_src_lgpl.qdoc
+++ b/doc/src/snippets/code/doc_src_lgpl.qdoc
@@ -187,7 +187,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
diff --git a/doc/src/snippets/code/doc_src_licenses.qdoc b/doc/src/snippets/code/doc_src_licenses.qdoc
index 2fbab661e637e0b7c8a897168b5a6fdc686d9082..0c6408b27792df08d8f7af3d6508b3276494f184 100644
--- a/doc/src/snippets/code/doc_src_licenses.qdoc
+++ b/doc/src/snippets/code/doc_src_licenses.qdoc
@@ -43,7 +43,7 @@
----------------------------------------------------
this font is provided free for personal or commercial use,
- it can be redistributed however it may not be sold.
+ it can be redistributed however it may not be sold.
----------------------------------------------------
(C) 1999 utopiafonts. dale_thorpe@bssc.edu.au
//! [1]
@@ -95,7 +95,7 @@
otherwise to promote the sale, use or other dealings in this Font Software
without prior written authorization from the Gnome Foundation or Bitstream
Inc., respectively. For further information, contact: fonts at gnome dot
- org.
+ org.
Arev Fonts Copyright
------------------------------
@@ -122,7 +122,7 @@
the words "Tavmjong Bah" or the word "Arev".
This License becomes null and void to the extent applicable to Fonts
- or Font Software that has been modified and is distributed under the
+ or Font Software that has been modified and is distributed under the
"Tavmjong Bah Arev" names.
The Font Software may be sold as part of a larger software package but
diff --git a/doc/src/snippets/code/doc_src_moc.cpp b/doc/src/snippets/code/doc_src_moc.cpp
index ba95e2fcf7c7de4527df3b1de2f75af02b5274ab..79cd49a7283e0a11d5c7c512e4564da15b1cadea 100644
--- a/doc/src/snippets/code/doc_src_moc.cpp
+++ b/doc/src/snippets/code/doc_src_moc.cpp
@@ -45,7 +45,7 @@
//! [4]
#ifndef Q_MOC_RUN
- ...
+ ...
#endif
//! [4]
diff --git a/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp b/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp
index 5a4cd8211ac7bbe0164989dafc04795c2ca2054b..4996260462d62b0e2b4d0f9b8aef42f04b899833 100644
--- a/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp
+++ b/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp
@@ -42,14 +42,14 @@
QProcess *process = new QProcess(this);
QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath)
+ QLatin1String("/assistant");
-
+
process->start(app, QStringList() << QLatin1String("-enableRemoteControl"));
if (!process->waitForStarted()) {
QMessageBox::critical(this, tr("Remote Control"),
tr("Could not start Qt Assistant from %1.").arg(app));
return;
}
-
+
// show index page
QTextStream str(process);
str << QLatin1String("SetSource qthelp://mycompany.com/doc/index.html")
diff --git a/doc/src/snippets/dockwidgets/Resources/titles.txt b/doc/src/snippets/dockwidgets/Resources/titles.txt
index 016825d87422daf6789e3282fc8dba7c904a7461..537926024c8346e3c36814da0071480f20d2b8a3 100644
--- a/doc/src/snippets/dockwidgets/Resources/titles.txt
+++ b/doc/src/snippets/dockwidgets/Resources/titles.txt
@@ -1,7 +1,7 @@
-Qt Classes by Module :/Resources/modules.html
-QtCore :/Resources/qtcore.html
-QtGui :/Resources/qtgui.html
-QtNetwork :/Resources/qtnetwork.html
-QtOpenGL :/Resources/qtopengl.html
-QtSql :/Resources/qtsql.html
-QtXml :/Resources/qtxml.html
+Qt Classes by Module :/Resources/modules.html
+QtCore :/Resources/qtcore.html
+QtGui :/Resources/qtgui.html
+QtNetwork :/Resources/qtnetwork.html
+QtOpenGL :/Resources/qtopengl.html
+QtSql :/Resources/qtsql.html
+QtXml :/Resources/qtxml.html
diff --git a/doc/src/snippets/modelview-subclasses/window.cpp b/doc/src/snippets/modelview-subclasses/window.cpp
index 951b40be97ab78d3afc45a0791f6cc85efa3d86d..a9ef07ac6d2f100405e79e3c4f9494b597195e62 100644
--- a/doc/src/snippets/modelview-subclasses/window.cpp
+++ b/doc/src/snippets/modelview-subclasses/window.cpp
@@ -79,7 +79,7 @@ void MainWindow::selectOpenFile()
{
QString fileName = QFileDialog::getOpenFileName(this,
tr("Select a file to open"), "", tr("Sound files (*.wav)"));
-
+
if (!fileName.isEmpty())
openFile(fileName);
}
diff --git a/doc/src/snippets/persistentindexes/mainwindow.cpp b/doc/src/snippets/persistentindexes/mainwindow.cpp
index 21ecb6bb0763ebf4ee0d36a238071d028c0ca7e5..042c5ae8e88cc1e404522c5310da67a482728262 100644
--- a/doc/src/snippets/persistentindexes/mainwindow.cpp
+++ b/doc/src/snippets/persistentindexes/mainwindow.cpp
@@ -81,7 +81,7 @@ MainWindow::MainWindow(QWidget *parent)
connect(selectionModel,
SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
this, SLOT(updateMenus(const QModelIndex &)));
-
+
setCentralWidget(view);
setWindowTitle("View onto a string list model");
}
diff --git a/doc/src/snippets/qabstractsliderisnippet.cpp b/doc/src/snippets/qabstractsliderisnippet.cpp
index 5fa1c421a022d14de7d1e8438177187bbcb10a66..babff95a576cdd06353b1ab0f486205922ea6c17 100644
--- a/doc/src/snippets/qabstractsliderisnippet.cpp
+++ b/doc/src/snippets/qabstractsliderisnippet.cpp
@@ -502,7 +502,7 @@ bool QAbstractSlider::event(QEvent *e)
break;
}
#endif
-
+
return QWidget::event(e);
}
diff --git a/doc/src/snippets/qsvgwidget/spheres.svg b/doc/src/snippets/qsvgwidget/spheres.svg
index 9e3819306a73a23b4f7a334ef0795f5bc73e92e9..b894f7e90bcd0cc060cc0a2c3d0fb45b43ccc931 100644
--- a/doc/src/snippets/qsvgwidget/spheres.svg
+++ b/doc/src/snippets/qsvgwidget/spheres.svg
@@ -1,6 +1,6 @@
<?xml version="1.0" standalone="no"?>
<svg width="8cm" height="8cm" viewBox="0 0 400 400"
- xmlns="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink/"
baseProfile="tiny" version="1.2">
<title>Spheres</title>
diff --git a/doc/src/snippets/qsvgwidget/sunflower.svg b/doc/src/snippets/qsvgwidget/sunflower.svg
index b60dd11a634e858dc8b884e09eb6aae61779255a..e888cb74d0a7a74fb2ea9a60e5f0d459edebadcc 100644
--- a/doc/src/snippets/qsvgwidget/sunflower.svg
+++ b/doc/src/snippets/qsvgwidget/sunflower.svg
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
<svg width="289.619" height="450.482"
xmlns="http://www.w3.org/2000/svg" baseProfile="tiny" version="1.1">
- <defs>
- <marker id="ArrowEnd" viewBox="0 0 10 10" refX="0" refY="5"
- markerUnits="strokeWidth"
- markerWidth="4"
- markerHeight="3"
- orient="auto">
- <path d="M 0 0 L 10 5 L 0 10 z" />
+ <defs>
+ <marker id="ArrowEnd" viewBox="0 0 10 10" refX="0" refY="5"
+ markerUnits="strokeWidth"
+ markerWidth="4"
+ markerHeight="3"
+ orient="auto">
+ <path d="M 0 0 L 10 5 L 0 10 z" />
</marker>
- <marker id="ArrowStart" viewBox="0 0 10 10" refX="10" refY="5"
- markerUnits="strokeWidth"
- markerWidth="4"
- markerHeight="3"
- orient="auto">
- <path d="M 10 0 L 0 5 L 10 10 z" />
+ <marker id="ArrowStart" viewBox="0 0 10 10" refX="10" refY="5"
+ markerUnits="strokeWidth"
+ markerWidth="4"
+ markerHeight="3"
+ orient="auto">
+ <path d="M 10 0 L 0 5 L 10 10 z" />
</marker> </defs>
<g>
<defs><linearGradient id="1" x1="155.352" y1="450.482" x2="155.352" y2="140" gradientUnits="userSpaceOnUse">
diff --git a/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp b/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp
index 1e33d78355cfa69aa15fdd92e0848eab7c3d8985..baa021b052a06d9f66b71d1a550163d22df21219 100644
--- a/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp
+++ b/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp
@@ -112,7 +112,7 @@ void MainWindow::averageItems()
foreach (item, selected) {
bool ok;
double value = item->text().toDouble(&ok);
-
+
if (ok && !item->text().isEmpty()) {
total += value;
number++;