summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* my changelogPeter Hartmann2010-05-061-0/+19
|
* Doc - mention vcsubdirs as a possible value for TEMPLATESimon Hausmann2010-05-061-0/+1
| | | | | | | It is usually the result of using subdirs in the .pro file and then using -tp vc to turn it into vcsubdirs. Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-067-14/+39
|\
| * Fix syntax error in configure scriptBernhard Rosenkraenzer2010-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ./configure: line 5883: [: missing `]' ./configure: line 5883: no: command not found It's either if [ "$CFG_OPENGL" = "es1" -o "$CFG_OPENGL" = "es2" ]; then or if [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es2" ]; then but not if [ "$CFG_OPENGL" = "es1" || "$CFG_OPENGL" = "es2" ]; then Merge-request: 616 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * fix qmake project file following msvc2010 additionOswald Buddenhagen2010-05-061-3/+5
| | | | | | | | this is relevant only for maintainers, but still.
| * remove extraneous return statementOswald Buddenhagen2010-05-061-1/+0
| |
| * cosmetics: change enum valueOswald Buddenhagen2010-05-061-1/+1
| | | | | | | | | | the existing values are fixed-point representations of the msvc versions, so adhere to it.
| * isOnActiveSpace is available from 10.6.Carlos Manuel Duclos Vergara2010-05-061-7/+14
| | | | | | | | | | | | | | | | | | | | The fix for qtcreatorbug-827 included a call to isOnActiveSpace, which is only available from 10.6 so this patch adds a runtime check for it. Since it is a runtime check there is no need for multiple builds. Notice that the fix for qtcreatorbug-827 will work only on 10.6+ Task-number: QTCREATORBUG-827 Reviewed-by: Richard Moe Gustavsen
| * QTcpServer: Fix documentation for previous commitMarkus Goetz2010-05-061-1/+2
| |
| * Keep support for maximum pending connections in derived QTcpServerRobin Helgelin2010-05-062-0/+16
| | | | | | | | | | | | | | | | | | | | | | By adding a new function to the class QTcpServer it's now possible to extend QTcpserver functionality with for instance SSL capabilities and still keep the support for maximum pending connections. Task-number: QTBUG-1875 Reviewed-by: Peter Hartmann Reviewed-by: Markus Goetz Merge-Request: 568
* | doc: Second attempt to begin reorganizing the top doc page.Martin Smith2010-05-066-20/+28
|/ | | | This change actually changes the left panels. Much more to come.
* [QNAM FTP] Check for the "ftp" scheme case-insensitivelyThiago Macieira2010-05-051-1/+1
|
* Use QUrl::isLocalFile and fix the scheme checking in local URLs.Thiago Macieira2010-05-053-9/+19
| | | | | | | | | RFC 3986 requires that schemes be compared case-insensitively, so "QRC:/" is allowed for Qt resources. Also document the use of file engines and search paths. Reviewed-by: Markus Goetz
* Improve QUrl handling of local file pathsThiago Macieira2010-05-053-23/+62
| | | | | | | | | | | | | | | | Add QUrl::isLocalFile for a faster and more consistent checking of whether the URL is local or not. Improve the documentation to indicate that QUrl always treats SMB-like file paths as local, even if the system cannot open them (non-Windows). Add a test to ensure that "FILE:/a.txt" is considered local too (RFC 3986 requires schemes to be interpreted in case-insensitive fashion). Remove broken code that supported empty schemes as local file paths. Reviewed-by: Markus Goetz
* tst_qnetworkreply: add a test for getting from SMBThiago Macieira2010-05-052-0/+4
| | | | Reviewed-By: Markus Goetz
* whitespace fixesThiago Macieira2010-05-051-10/+10
|
* Doc: Changes to the HTML outputMorten Engvoldsen2010-05-054-100/+88
| | | | | | Changes in css, htmlgenerator (removing redundant class names), updating html templates and updating js. Reviewed-by: Morten Engvoldsen
* Fixes a crash in QGestureManagerDenis Dzyubenko2010-05-051-0/+3
| | | | | | | | Work around the case when we reach QGestureManager indirectly from QGraphicsObject destructor. Task-number: QT-3262 Reviewed-by: Thomas Zander
* Fixes a crash when unregistering a recognizer.Denis Dzyubenko2010-05-054-5/+23
| | | | | | | | | | | Another fix for the same problem - we also need to be careful - when ungrabbing a gesture for the recognizer that has already been destroyed and cleaning up the QGesture object for it we need to make sure we know it is removed from the obsolete gestures list so that we won't delete it again in the QGestureManager detructor. Task-number: QTBUG-9801 Reviewed-by: Thomas Zander
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-057-24/+36
|\
| * Fix build key on Windows with MinGW.Daniel Molkentin2010-05-052-1/+1
| | | | | | | | | | | | Also, rebuilt configure.exe Reviewed-by: Thiago Macieira
| * Don't leak QVistaHelper from QWizardBradley T. Hughes2010-05-051-1/+2
| | | | | | | | | | | | | | | | | | The default QObject constructor was not called, meaning the vista helper was never registered as a child of the QWizard (and therefore never deleted when the QWizard was destructed). Task-number: QTBUG-10203 Reviewed-by: olivier
| * QHostInfo: Avoid one tiny copy of QHostInfo object when emittingMarkus Goetz2010-05-051-1/+1
| | | | | | | | | | | | Thanks rittk! Reviewed-by: Olivier
| * QHostInfo: Emit postponed lookup results when finishing currentMarkus Goetz2010-05-052-0/+14
| | | | | | | | Reviewed-by: Thiago
| * QHostInfo: Immediately delete aborted lookup requests.Markus Goetz2010-05-051-0/+17
| | | | | | | | Reviewed-by: Thiago
| * Some minor code cleanupJens Bache-Wiig2010-05-052-20/+0
| | | | | | | | | | | | Removes unused code from gkt and cleanlooks. Reviewed-by: Trust Me
| * correct misleading note in configure on WindowsPeter Hartmann2010-05-052-1/+1
| | | | | | | | | | | | | | the option given in the note would not work if used as described. Reviewed-by: Zeno Albisser Task-number: QTBUG-2089
* | doc: Began reorganization of the top doc page.Martin Smith2010-05-0518-19/+51
|/ | | | Much more to come.
* qdoc: Removed [module name] from class ref pages.Martin Smith2010-05-051-0/+3
| | | | The module name is now a breadcrumb.
* Update changelog.Aaron McCarthy2010-05-051-0/+7
|
* Skip tst_LargeFile::mapOffsetOverflow on MacJoão Abecasis2010-05-041-0/+4
| | | | | | | | | | On this platform mmap'ing beyond EOF may succeed, even beyond filesystem capabilities, but generate Bus Errors on access. Skipping this failing test and accepting the underlying undefined behavior is the right thing to do, until QFile offers proper guarantees. Reviewed-by: Thiago Macieira
* QtDeclarative: remove spurious semi-colons from the source codeThiago Macieira2010-05-0416-19/+19
|
* Doc: Updating style and HTML in CSS and qdocMorten Engvoldsen2010-05-042-17/+91
| | | | | | Adding all classnames generated in qdoc to the CSS and removing redundant &nbsp; from htmlgenerator. Reviewed-by: Trust Me
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-047-7/+908
|\
| * Fix rtl issues with sliders in GTK styleJens Bache-Wiig2010-05-041-7/+16
| | | | | | | | | | | | | | | | | | | | Sliders that draw groove decorations did not invert appearance correctly in vertical or rtl cases. With this fix we will flip the rectangles of the respective decorations and tell gtk if we are using an rtl widget or not. Task-number: QTBUG-8986 Reviewed-yb: thorbjorn
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-041-28/+28
| |\
| * | Doc: Fixed up the diagrams, aligning items with a grid.David Boddie2010-05-044-101/+101
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge commit 'refs/merge-requests/2379' of git://gitorious.org/qt/qt into ↵David Boddie2010-05-046-0/+892
| |\ \ | | | | | | | | | | | | integration
| | * | Add diagrams for illustrating the process of moving rows.Stephen Kelly2010-05-036-0/+892
| | | |
* | | | qdoc: Fixed the alphabet index in the compact list.Martin Smith2010-05-042-13/+8
| |_|/ |/| | | | | | | | | | | | | | Now it leaves out any letter that doesn't appear in the list. i.e. If there are no classes that begin with QJ... J does not appear in the alphabet index.
* | | doc: Edited the intro.Martin Smith2010-05-0445-1170/+1422
|\ \ \ | |/ /
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-0422-78/+278
| |\ \
| | * | Fix missing pressed state for scrollbars with QGtkStyleJens Bache-Wiig2010-05-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pushing this to 4.7 as it is an easy fix and highly noticable in the latest official release of Ubuntu. Task-number: QTBUG-10396 Reviewed-by: thorbjorn
| * | | Doc: A number of fixes and updates for the new design. See detailsMorten Engvoldsen2010-05-0444-892/+1021
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index.qdoc updated the HTML to use sprites images - deleted obsolete images from templates/images images - added new images to templates/images styles.css - updated styles to handle index, sprites and templates correct. assistant.qdoconf - updates images designer.qdoconf - updates images linguist.qdoconf - updates images declarative.qdoconf - updates images qmake.qdoconf - updates images qt-build-docs.qdoconf - updates images qt-build-docs_zh_CN.qdoconf - updates images qt-defines.qdoconf - updates images qt.qdoconf - updates images qt_zh_CN.qdoconf - updates images qt-htmlTemplates.qdoconf - updated template to use sprites declarativeui.qdoc - removed <br> Reviewed-by: Trust Me
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-0495-632/+2617
| |\ \ \
| * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-03647-154367/+262458
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-294-9/+38
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-28121-570/+3271
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-273-1/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-2713-40/+742
| |\ \ \ \ \ \ \ \