summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicDavid Boddie2009-07-09868-2502/+7547
|\
| * Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-097-8/+616
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-077-8/+616
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
| | | * Doc: adding details to qmake docsMorten Engvoldsen2009-07-021-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation about the create_prl and link_prl to the CONFIG variable in the qmake manual Task-number: 165165 Rev-by: Geir Vattekar Rev-by: Volker Hilsheimer
| | | * Doc: Said which formats we support for a QIODevice driven MediaSourceGeir Vattekar2009-06-301-1/+6
| | | | | | | | | | | | | | | | | | | | Task-number: 253902 Reviewed-by: Thierry Bastian
| | | * Doc: Fixed links that pointed to removed documentation.Geir Vattekar2009-06-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Information on issues with the icc compiler has been moved in the docs. Redirected links that still pointed to the old location. Task-number: 257039 Reviewed-by: Morten Engvoldsen
| | | * Remove links to out-of-date class chart.Jason McDonald2009-06-302-4/+0
| | | | | | | | | | | | | | | | Reviewed-by: Gareth Pethig
| | | * Doc: Adding documentation on supported data types in Qt SQL moduleMorten Engvoldsen2009-06-292-0/+587
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a table showing the use of different data types in relations with different Qt-supported Databases. Also reviewed by Task-number: 182851 Rev-by: Geir Vattekar Rev-by: David Boddie Rev-by: Bill King
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-29760-1610/+1996
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| * | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-30785-1876/+3253
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| | * | | Doc - Adding the steps to import a pro file via VS Add-inKavindra Devi Palaraja2009-06-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com> Task: 157404
| | * | | Doc: Documented the Move Blocks example.Geir Vattekar2009-06-294-0/+229
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Aardal Hanssen
| | * | | Doc - Improved the Detailed Description section for QCheckBox withKavindra Devi Palaraja2009-06-292-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screenshots and some cleaned up sentences. Reviewed-By: TrustMe Details: Also fixed the error in the sentence mentioning that QButtonGroup can be used to group buttons visually thanks to a bug report.
| | * | | Fix old/missing license headers from multitouch+gestures merge.Jason McDonald2009-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-254-17/+334
| | |\ \ \
| | | * | | Flesh out the OpenVG module documentation a bit.Rhys Weatherley2009-06-253-17/+269
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | Document the EGL and OpenVG qmake.conf settings.Rhys Weatherley2009-06-251-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-241-1/+25
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-06-2411-32/+533
| | | |\ \ \
| | | * | | | Doc: List the Debian/Ubuntu packages required to build Qt for X11.David Boddie2009-06-241-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-247-31/+434
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp
| | | * | | | Update documentation to remove mentions of Panther.Norwegian Rock Cat2009-06-241-29/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer support it, so make that obvious in the docs as well.
| | | * | | | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-236-2/+390
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| | | | * | | Fix the dash pattern examples in the documentation of QPenBenjamin Poulain2009-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom dash pattern must have an even number of entries. Our examples were using an odd number.
| | | | * | | Doc - Adding the new Frozen Column Example by Pierre Rossi into our list ofKavindra Devi Palaraja2009-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples Reviewed-By: TrustMe
| | | | * | | Doc - Adding Pierre Rossi's frozen column exampleKavindra Devi Palaraja2009-06-234-0/+387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-234-1/+99
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-223-1/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
| | | * | | | QNetworkDiskCache: add code snippets in documentationPeter Hartmann2009-06-221-0/+24
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | should make it easier to apply a network disk cache with code snippets now Reviewed-by: David Boddie <dboddie@trolltech.com> Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-228-13/+299
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicsscene.cpp
| | | * | | Changed enum Qt::Uninitialized to enum Qt::InitializationMartin Smith2009-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enum Qt::Uninitialized contains one value, which is also called Uninitialized. Because the type and the value used the same name, wherever the type Qt::Uninitialized was used in a function signature, you had to include the enum keyword. But qdoc's preprocessor doesn't like that, so you have to take the enum keyword out of the signatures. But then the compiler complains because the type and the value look the same. So I had to change the enum type name to Initialization, so the compiler can distinguish it from the value name. And qdoc likes that too.
| | | * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-7/+0
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| | | | * | BT: Remove Intel CC 10 issue from known issues doc.Jason McDonald2009-06-171-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | Acked-by: Andy Shaw
| | | * | | Make construction of unitialized QTransform/QMatrix a no-op.Bjørn Erik Nilsen2009-06-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These constructors are useful when you have to create a temporary uninitialized QTransform/QMatrix and later initialize it to something else. Done with Lars. Reviewed-by: samuel
| | | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGeir Vattekar2009-06-181-0/+28
| | | |\ \ \
| | | * | | | Doc: Added snippet files for state machine overview.Geir Vattekar2009-06-185-0/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | Doc: Removed mention of QItemAnimation from animation docs and setGeir Vattekar2009-06-181-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPropertyAnimation as a main class. Reviewed-by: Trust Me
| | * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-182-125/+44
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| | | * | | | doc: Added explanation of QStringBuilder in QStringMartin Smith2009-06-181-0/+28
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QStringBuilder class documentation is marked \internal. A section has been added to the documentation for QString that explains how to use the reimplemented '%' operator of QStringBuilder to obtain more efficient string concatenation operations.
| | | * | | Doc: Resolved merge conflict in state machine overviewGeir Vattekar2009-06-181-125/+16
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-17766-1694/+1692
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| | | * | | Update license headers in files that are new in 4.6.Jason McDonald2009-06-1711-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | Removed trailing whitespace.Bruno Abinader2009-06-165-116/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org> Merge-request: 628 Reviewed-by: David Boddie <dboddie@trolltech.com>
| | | * | | Fixed small typo on the animation framework documentation.Bruno Abinader2009-06-161-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractClass is in fact QAbstractTransition, also added proper link to the addAnimation() method from that class. Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org> Merge-request: 628 Reviewed-by: David Boddie <dboddie@trolltech.com>
| | | * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-16755-1551/+1551
| | | |\ \ \ | | | | |/ /
| | | | * | Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-167-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-16755-1538/+1538
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-162-2/+32
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc doc/src/snippets/code/src_gui_qproxystyle.cpp src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_x11.cpp src/gui/kernel/qt_x11_p.h src/gui/kernel/qwidget.cpp src/gui/styles/qproxystyle.cpp src/gui/styles/qstyle.cpp src/scripttools/debugging/qscriptdebugger.cpp src/scripttools/debugging/qscriptenginedebugger.cpp src/sql/drivers/odbc/qsql_odbc.cpp src/sql/kernel/qsqldatabase.cpp src/sql/kernel/qsqldriver.cpp
| | | * | | doc: Added info on two ways to customize the style.Martin Smith2009-06-161-0/+30
| | | | | |
| | | * | | doc: Fixed several qdoc errors.Martin Smith2009-06-161-1/+1
| | | | | |