summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
* Merged branch 'master' of git://gitorious.org/~icwiener/qt/icwieners-clone.gitTor Arne Vestbø2009-05-1824-29/+29
|\ | | | | | | | | | | | | | | Frederik Schwarzer (1): typos in docs: double "the" Merge-request: http://qt.gitorious.org/qt/qt/merge_requests/362 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
| * typos in docs: double "the"Frederik Schwarzer2009-05-1124-29/+29
| |
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-185-10/+14
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * | Adding change details in to Qt 3 to Qt 4 porting guideMorten Engvoldsen2009-05-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Adding details about QCloseEvents being acceptet by default in Qt 4 opposed to Qt 3 Task-number: 192607 Rev-by: msorvig
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Andy Shaw2009-05-181-4/+0
| |\ \
| | * | QCss: font-family handle fallback font specsOlivier Goffart2009-05-181-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if one specify more than one parameter in font-family, e.g., font-family: Verdana, Arial Qt should fallback on the second font if the first cannot be found. QFont::setFamily handle the case when the family name contains a comas, so we do not need to handle that specially in the css parser code. Task-number: 252311 Reviewed-by: Thomas Zander
| * | | Fix incorrect signal referred to in the docsAndy Shaw2009-05-181-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Fix the documentation to state sortIndicatorChanged() should be used and not sectionClicked() for connecting to the sortByColumn() slot as the sortByColumn() takes two parameters, not one. Reviewed-by: Kavindra Palaraja
| * | Cleaning bug in custom layout example.Morten Engvoldsen2009-05-152-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | The example was using deleteAllItems() to delete items from the layout. This method is now part of the QT3_SUPPORT and shold not be used if not needed. Replaced by deleting all items one by one. Task-number: 220656 Rev-by: janarve
* | | Add an extension to QPixmapCache to get rid of strings.Alexis Menard2009-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit add a new API to add/find/remove pixmaps into QPixmapCache. This new extension is based on a key that the cache give you during the insertion. This key is internally a int which makes all operations in the cache much more faster that the string approach. Auto-tests has been extended as well and a benchmark has been added to compare both approach. I also depecrate the find method for the string API to have a method pointer based and not reference based like the Qt policy says. Reviewed-by: bnilsen Reviewed-by: andreas Followed-deeply-by: trond
* | | Merge branch '4.5'Thiago Macieira2009-05-142-24/+33
|\ \ \ | |/ / | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * | Correcting bug in cardLayout exampleMorten Engvoldsen2009-05-132-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | Adding the count() function to the example. Task-number: 220766 Rev-by: Geir Vattekar
* | | Merge branch 'master' of ../master into contiguouscacheIan Walters2009-05-143-5/+102
|\ \ \
| * \ \ Merge branch '4.5'Thiago Macieira2009-05-132-8/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| | * | Clearifying docs QSet::insertMorten Engvoldsen2009-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chaning the sentence to clearify where the iterator points to. Task-number: 202656 Rev-by: Geir Vattekar
| | * | qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-7/+7
| | | |
| * | | Merge commit 'origin/4.5'Olivier Goffart2009-05-132-4/+101
| |\ \ \ | | |/ /
| | * | Reviewed-by: TrustMeVolker Hilsheimer2009-05-121-2/+2
| | | | | | | | | | | | | | | | Small polishing.
| | * | Adding documentation to the fancy browser exampleMorten Engvoldsen2009-05-121-3/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation to the fancy browser example. Task-number:252097 Rev-by: Geir Vattekar Rev-by: Ariya Hidayat
| | * | Correcting bug in custom Database Driver code snipptetMorten Engvoldsen2009-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding const to call. Changing QSqlRecord record() { return QSqlRecord(); } to QSqlRecord record() const { return QSqlRecord(); } This is needed since record() is a virtual function. Task-number:204557 Rev-by: Geir Vattekar
* | | | Merge branch 'master' into contiguouscacheIan Walters2009-05-1239-560/+358
|\ \ \ \ | |/ / /
| * | | Add a AA_MacDontSwapCtrlAndMeta application attribute.Norwegian Rock Cat2009-05-111-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help undo the some magic that is in the Qt/Mac port. Qt automatically flips the Meta and Control keys on Mac. This is a "feature" that makes porting older programs that don't use standard shortcuts easier as Ctrl and Command usually map to the same shortcuts in the application. The upshot of this is that I need to strip the text() out of key events if they contain the Control or Meta modifier. This causes much headache for anyone writing a terminal emulator. Though they would still have to write special code because the keys are swapped anyway. This allows people to write the terminal emulator where hitting the Control key will really send a Control key modifier. We've also done the extra work to ensure that standard shortcuts work correctly regardless of what the value of the attribute is. That is, if you specify QKeySequence::Cut for a shortcut you can always hit Command+X and things will work.
| * | Merge branch '4.5'Thiago Macieira2009-05-111-2/+0
| |\ \ | | |/
| | * Correcting typoMorten Engvoldsen2009-05-081-2/+0
| | | | | | | | | | | | Removing linebreaks in the document
| * | Merge branch '4.5'Thiago Macieira2009-05-071-0/+10
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| | * Added types to the list.Morten Engvoldsen2009-05-071-0/+10
| | | | | | | | | | | | | | | | | | Added two missing types to the list. Task-number: 252274
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-064-1/+15
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| | * Doc: Added info on NOTIFY to the Q_PROPERTY docs.Geir Vattekar2009-05-062-1/+7
| | | | | | | | | | | | Task-number: 248336
| | * Adds in documentation for RESOURCESAndy Shaw2009-05-061-0/+7
| | | | | | | | | | | | Reviewed-by: Kavindra Palaraja <kavindra.palaraja@nokia.com>
| | * Added function that was removed on the way from Qt3 to Qt4Morten Engvoldsen2009-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | | QMimeSource::serialNumber was removed in Qt 4. This was not documented in Porting to Qt 4 Task-number:250575 Rev-By: Trenton Schulz
| * | Fix typos in doc.Norwegian Rock Cat2009-05-042-3/+3
| | | | | | | | | | | | Spotted-by: Olivier
| * | Deprecate qt_mac_set_show_menubar for a public cross-platform API.Norwegian Rock Cat2009-05-042-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm tired of these "hidden" functions. We have an AA_MacPluginApplication, but sometimes you may have a legitimate reason for setting this outside of "plugin applications." In the footsteps of the menu icon attribute, the attribute is the main leader, but menubars can disable/enable this locally the new QMenuBar::setNativeMenuBar() property. Otherwise, the menubars take their que from the application attribute. This also works for Windows CE. So, there is a bit on convergence as well. Task-number: 236757
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-042-6/+10
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/itemviews/qabstractitemview.cpp
| | * Doc - Clarifying how to override a Widget's size hint in the Getting toKavindra Devi Palaraja2009-05-041-4/+8
| | | | | | | | | | | | | | | | | | | | | Know Qt Designer document. Task-number: 165435 Reviewed-by: Friedemann Kleint <friedemann.kleint@nokia.com>
| | * Correcting typoMorten Engvoldsen2009-04-301-2/+2
| | | | | | | | | | | | Missed a whitespace - corrected it. No task
| * | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-293-5/+114
| |\ \ | | |/
| | * Documented the flow layout example.Morten Engvoldsen2009-04-292-4/+113
| | | | | | | | | | | | | | | | | | | | | | | | Wrote documentation for the flowlayout class. Task-number: 252548 Rev-by: Geir Vattekar Rev-by: janarve
| | * Corrected typoMorten Engvoldsen2009-04-291-1/+1
| | | | | | | | | | | | | | | | | | Changed smae to same Taks number:251646
| * | Add qDrawBorderPixmap() function, Qt::TileRules enum, QMargins struct and ↵Marius Bugge Monsen2009-04-291-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | QTileRules struct. Implements a function to allow drawing CSS3-like border-images (also known as nine-grid images). Next step will be to convert the CSS-style code to use this function for drawing border-images. Task-number: none Reviewed-by: jbache
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-1/+1
| |\ \ | | |/
| | * Fix broken link in documentation.Jason McDonald2009-04-291-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-271-5/+4
| |\ \ | | |/
| | * Increment Qt version number in qdoc namespaces.Jason McDonald2009-04-271-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | As we saw with the 4.5.1 release, failing to increment the namespaces when incrementing the Qt version causes some featuresof Assistant to break. Reviewed-by: Trust Me
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-247-355/+0
| |\ \ | | |/
| | * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-247-355/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 242472777d440a540b4bc944c84eb522388e384e ) Changes in WebKit since the last update: ++ b/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" * WebKit.pro: Include docs.pri for "make docs" target. ++ b/WebKit/qt/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" Added code snippets and overview from the Qt sources references in the API docs. * Api/qwebpage.cpp: Adjust paths to snippets. * Api/qwebview.cpp: Ditto. * docs/docs.pri: Added. * docs/qtwebkit.qdoc: Added. * docs/qtwebkit.qdocconf: Added. * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added. * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added. * docs/webkitsnippets/simple/main.cpp: Added. * docs/webkitsnippets/simple/simple.pro: Added. * docs/webkitsnippets/webpage/main.cpp: Added. * docs/webkitsnippets/webpage/webpage.pro: Added. Moved QtWebKit documentation into the WebKit project under src/3rdparty/webkit This is needed to have "make docs" inside WebKit and allows contributors to the WebKit project to write API docs. I'm doing the change in 4.5 to simplify merging with Qt 4.6. Reviewed-by: Trust me
| * | Remove the Direct3D engine.Gunnar Sletta2009-04-241-11/+4
| | |
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-233-0/+52
| |\ \ | | |/
| | * Add Google Suggest as a new network exampleAriya Hidayat2009-04-233-0/+52
| | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | Merge branch '4.5'Thiago Macieira2009-04-233-0/+52
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | * Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-233-0/+52
| | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-234-0/+70
| |\ \ | | |/