summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/photo.n11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/photo.n b/doc/photo.n
index 101d2ca..c14abe3 100644
--- a/doc/photo.n
+++ b/doc/photo.n
@@ -210,9 +210,14 @@ the specified color.
Specifies the name of the image file format handler to be used.
Specifically, this subcommand searches
for the first handler whose name matches an initial substring of
-\fIformat-name\fR and which has the capability to read this image data.
-If this option is not given, this subcommand uses the first
-handler that has the capability to read the image data.
+\fIformat-name\fR and which has the capability to write a string
+containing this image data.
+If this option is not given, this subcommand uses a format that
+consists of a list (one element per row) of lists (one element per
+pixel/column) of colors in
+.QW \fB#\fIrrggbb\fR
+format (where \fIrr\fR is a pair of hexadecimal digits for the red
+channel, \fIgg\fR for green, and \fIbb\fR for blue).
.TP
\fB\-from \fIx1 y1 x2 y2\fR
Specifies a rectangular region of \fIimageName\fR to be returned.
h'>
-rw-r--r--examples/xml/saxbookmarks/jennifer.xbel6
-rw-r--r--examples/xml/streambookmarks/frank.xbel4
-rw-r--r--examples/xml/streambookmarks/jennifer.xbel6
-rw-r--r--src/corelib/io/qurl.cpp8
-rw-r--r--src/corelib/xml/qxmlstream.h2
-rw-r--r--src/gui/dialogs/qmessagebox.cpp4
-rw-r--r--src/gui/kernel/qwidget.cpp2
-rw-r--r--src/gui/text/qtextformat.cpp2
-rw-r--r--src/gui/widgets/qvalidator.cpp4
-rw-r--r--src/network/access/qhttp.cpp8
-rw-r--r--src/network/socket/qabstractsocket.cpp2
-rw-r--r--src/qt3support/network/q3http.cpp10
-rw-r--r--src/qt3support/network/q3url.cpp4
-rw-r--r--src/xml/sax/qxml.cpp6
-rw-r--r--src/xmlpatterns/functions/qsystempropertyfn.cpp2
-rw-r--r--tests/auto/qhttp/tst_qhttp.cpp8
-rw-r--r--tools/designer/src/lib/shared/textpropertyeditor.cpp2
-rw-r--r--tools/doxygen/config/header.html4
-rw-r--r--tools/doxygen/config/phonon.doxyfile2
-rw-r--r--tools/installer/nsis/installer.nsi6
-rw-r--r--tools/installer/nsis/opensource.ini8
-rw-r--r--tools/linguist/phrasebooks/polish.qph2
-rw-r--r--tools/qtconfig/previewwidgetbase.ui2
-rw-r--r--translations/assistant_adp_de.ts4
-rw-r--r--translations/assistant_adp_ja.ts4
-rw-r--r--translations/assistant_adp_pl.ts4
-rw-r--r--translations/assistant_adp_zh_CN.ts4
-rw-r--r--translations/assistant_adp_zh_TW.ts4
-rw-r--r--translations/assistant_de.ts8
-rw-r--r--translations/assistant_pl.ts4
-rw-r--r--translations/assistant_zh_CN.ts4
-rw-r--r--translations/assistant_zh_TW.ts8
-rw-r--r--translations/designer_ja.ts4
-rw-r--r--translations/designer_pl.ts4
-rw-r--r--translations/designer_zh_CN.ts4
-rw-r--r--translations/designer_zh_TW.ts8
-rw-r--r--translations/linguist_ja.ts8
-rw-r--r--translations/linguist_pl.ts4
-rw-r--r--translations/linguist_zh_CN.ts8
-rw-r--r--translations/linguist_zh_TW.ts8
-rw-r--r--translations/qt_ar.ts2
-rw-r--r--translations/qt_da.ts12
-rw-r--r--translations/qt_de.ts2
-rw-r--r--translations/qt_es.ts10
-rw-r--r--translations/qt_fr.ts18
-rw-r--r--translations/qt_iw.ts2
-rw-r--r--translations/qt_ja_JP.ts10
-rw-r--r--translations/qt_pl.ts10
-rw-r--r--translations/qt_pt.ts10
-rw-r--r--translations/qt_ru.ts4
-rw-r--r--translations/qt_sk.ts10
-rw-r--r--translations/qt_sv.ts6
-rw-r--r--translations/qt_uk.ts10
-rw-r--r--translations/qt_untranslated.ts2
-rw-r--r--translations/qt_zh_CN.ts14
-rw-r--r--translations/qt_zh_TW.ts18
-rw-r--r--translations/qtconfig_pl.ts4
-rw-r--r--translations/qtconfig_ru.ts2
-rw-r--r--translations/qtconfig_untranslated.ts2
-rw-r--r--translations/qtconfig_zh_CN.ts4
-rw-r--r--translations/qtconfig_zh_TW.ts4
-rw-r--r--util/qlalr/doc/qlalr.qdocconf4
-rwxr-xr-xutil/scripts/make_qfeatures_dot_h2
108 files changed, 279 insertions, 282 deletions
diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp
index 0d9d4b7..4b93ee2 100644
--- a/demos/browser/browsermainwindow.cpp
+++ b/demos/browser/browsermainwindow.cpp
@@ -838,7 +838,7 @@ void BrowserMainWindow::slotHome()
{
QSettings settings;
settings.beginGroup(QLatin1String("MainWindow"));
- QString home = settings.value(QLatin1String("home"), QLatin1String("http://qtsoftware.com/")).toString();
+ QString home = settings.value(QLatin1String("home"), QLatin1String("http://qt.nokia.com/")).toString();
loadPage(home);
}
diff --git a/demos/browser/data/defaultbookmarks.xbel b/demos/browser/data/defaultbookmarks.xbel
index 8c83032..6211811 100644
--- a/demos/browser/data/defaultbookmarks.xbel
+++ b/demos/browser/data/defaultbookmarks.xbel
@@ -3,7 +3,7 @@
<xbel version="1.0">
<folder folded="yes">
<title>Bookmarks Bar</title>
- <bookmark href="http://qtsoftware.com/">
+ <bookmark href="http://qt.nokia.com/">
<title>Qt Home Page</title>
</bookmark>
<bookmark href="http://webkit.org/">
diff --git a/demos/browser/settings.cpp b/demos/browser/settings.cpp
index eae199e..6c49e26 100644
--- a/demos/browser/settings.cpp
+++ b/demos/browser/settings.cpp