diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-20 07:23:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-20 07:23:43 (GMT) |
| commit | 67926b8e4d9e7463597ef113944d78ca326fd9ae (patch) | |
| tree | e24fa54e245a8c3b27cd1f740aaf5d296e05621b /doc | |
| parent | 2c762f3b8b284a7c6dc0c499b7052013bad5b707 (diff) | |
| parent | 10194aafd10824fe1919aa44083224e8bea442ca (diff) | |
| download | Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.zip Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.tar.gz Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/itemviews/qheaderview_p.h
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/deployment.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/index.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_qtestlib.qdoc | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc index d9f7c1a..bcfa93d 100644 --- a/doc/src/deployment.qdoc +++ b/doc/src/deployment.qdoc @@ -911,7 +911,7 @@ Then qApp->libraryPaths() would return something like this: "C:/customPath/plugins " - "C:/Qt/4.5.0/plugins" + "C:/Qt/%VERSION%/plugins" "E:/myApplication/directory/" The executable will look for the plugins in these directories and diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 49dfafd..4ead9e4 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -85,12 +85,6 @@ \endif \endif - \if defined(opensourceedition) - \bold{Note:} This edition is for the development of \l{Qt - Open Source Edition}{Free and Open Source} software only; see - \l{Qt Commercial Editions}. - \endif - \raw HTML <table cellpadding="2" cellspacing="1" border="0" width="100%" bgcolor="#e5e5e5"> <tr> diff --git a/doc/src/snippets/code/doc_src_qtestlib.qdoc b/doc/src/snippets/code/doc_src_qtestlib.qdoc index a4ef52e..ff52b2f 100644 --- a/doc/src/snippets/code/doc_src_qtestlib.qdoc +++ b/doc/src/snippets/code/doc_src_qtestlib.qdoc @@ -69,7 +69,7 @@ void TestQString::toUpper() //! [10] ********* Start testing of TestQString ********* -Config: Using QTest library 4.1.0, Qt 4.1.0 +Config: Using QTest library %VERSION%, Qt %VERSION% PASS : TestQString::initTestCase() PASS : TestQString::toUpper() PASS : TestQString::cleanupTestCase() @@ -99,4 +99,4 @@ private slots: } } }; -//! [12]
\ No newline at end of file +//! [12] |