summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Disable the unified toolbar before enteringFabien Freling2010-10-153-2/+37
| | | | | | | | | | fullscreen on Mac OS X. We are just enforcing what the documentation recommended. Task-number: QTBUG-13772 Reviewed-by: Samuel
* QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-152-6/+19
| | | | | | | | | | The setMinimumSize call was having precedence over the minimumSizeHint, so when having a sizegrip enabled it was possible to resize a MDI window to a much smaller size than its min size (actually it would flicker between the two sizes, on each resize). Fixed by moving that min size (for the titlebar contents) to the calculations in minimumSizeHint(). Reviewed-by: mariusso
* Fix tst_moduleqt47::accidentalImportOlivier Goffart2010-10-152-2/+2
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-14654-3306/+5298
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (61 commits) tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11 tst_qcompleter.cpp: fix test on mac. Fixed autotest that was missing focus on Windows QGraphicsLayoutItem - user set sizes should always override, even if there's a constraint QGridLayoutEngine - Rework height-for-width support so that row/col spanning works Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"" Fixed statement about const_iterator and some whitespace fixes. Adjust the parent index for the itemsMoved call. Correctly handle both 16bit and 32bit live pixmaps in meego graphics system. Correctly remove the egl alpha surface flags in meego graphics system. Proper dither & proper alpha checking. In meego graphics system, use always 16bit textures. QCompleter: do not auto complete when directory is changed. tst_qcompleter: Add a test for QFileSystemModel Doc: adjusting the search field width Doc - remove disclaimer Added the default format of QTime::toString(). Moved the property documentation to its proper location. Added Q_INVOKABLE to ignore file. Made several QMenuBar functions visible to qdoc and added documentation. ...
| * tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11Olivier Goffart2010-10-141-1/+2
| | | | | | | | | | | | The last fix on Windows broke it on linux Reviewed-by: thierry
| * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-14638-3205/+4339
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1395-604/+1460
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-131-1/+1
| | |\ \
| | | * | Doc: adjusting the search field widthMorten Engvoldsen2010-10-131-1/+1
| | | | |
| | * | | Fixed statement about const_iterator and some whitespace fixes.Jerome Pasion2010-10-132-3/+3
| | |/ / | | | | | | | | | | | | | | | | Task-number: QTBUG-14252 Reviewed-by: David Boddie
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-129-26/+30
| | |\ \
| | * | | Doc - remove disclaimerLeena Miettinen2010-10-121-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14407 Reviewed-by: Friedemann Kleint Reviewed-by: Henry Haverinen
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-116-15/+117
| | |\ \ \
| | * | | | Added the default format of QTime::toString().Jerome Pasion2010-10-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13710 Reviewed-by: David Boddie
| | * | | | Moved the property documentation to its proper location.Jerome Pasion2010-10-111-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14351 Reviewed-by: David Boddie
| | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0912-26/+80
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0834-489/+734
| | |\ \ \ \ \
| | * | | | | | Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14281 Reviewed-by: David Boddie
| | * | | | | | Made several QMenuBar functions visible to qdoc and added documentation.Jerome Pasion2010-10-081-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14026 Reviewed-by: David Boddie
| | * | | | | | Resized image, added missing files, and reformatted documentation ofJerome Pasion2010-10-087-57/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit Image Analyzer example.
| | * | | | | | Fixed grammar mistake.Jerome Pasion2010-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13712
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-10-08136-1297/+4199
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0798-945/+3135
| | | |\ \ \ \ \ \
| | | * | | | | | | Doc: tuning search reasult boxMorten Engvoldsen2010-10-071-0/+1
| | | | | | | | | |
| | | * | | | | | | qdoc: Don't generate html output for png files.Martin Smith2010-10-071-2/+2
| | | | | | | | | |
| | | * | | | | | | Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0Morten Engvoldsen2010-10-071-2/+2
| | | | | | | | | |
| | | * | | | | | | Doc: correcting bug - lenght() pointed to setLength() in "See also" section. ↵Morten Engvoldsen2010-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct link is resize()
| | | * | | | | | | Doc: correct spellingMorten Engvoldsen2010-10-071-1/+1
| | | | | | | | | |
| | | * | | | | | | Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cppMorten Engvoldsen2010-10-071-2/+2
| | | | | | | | | |
| | | * | | | | | | Doc: correcting grammar on the installation pagesMorten Engvoldsen2010-10-071-8/+8
| | | | | | | | | |
| | | * | | | | | | Doc: correcting broken link to labsMorten Engvoldsen2010-10-071-3/+4
| | | | | | | | | |
| | | * | | | | | | Doc: adding note to function QWSKeyboardHandler::processKeycode - that it ↵Morten Engvoldsen2010-10-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was added in Qt 4.6
| | | * | | | | | | Doc: correcting typoMorten Engvoldsen2010-10-071-1/+1
| | | | | | | | | |
| | | * | | | | | | Doc: Fixing bug - line too long and not visible. Breaking the line in twoMorten Engvoldsen2010-10-071-1/+2
| | | | | | | | | |
| | | * | | | | | | Doc: Fixing typoMorten Engvoldsen2010-10-071-1/+1
| | | | | | | | | |
| | | * | | | | | | Doc: Fixing snippet bug. Path pointing to the wrong snippetMorten Engvoldsen2010-10-071-1/+1
| | | | | | | | | |
| | | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0628-329/+1036
| | | |\ \ \ \ \ \ \
| | * | | | | | | | | Doc: Update to Phonon overviewGeir Vattekar2010-10-081-19/+0
| | |/ / / / / / / /
| | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-10-064-5/+11
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Added a project file for the Getting Started with QML and changed theJerome Pasion2010-10-063-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old file name references.
| | | * | | | | | | | Clarified the auto connect enumeration regarding which type ofJerome Pasion2010-10-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection is made. Task-number: QTBUG-14223 Reviewed-by: David Boddie
| | * | | | | | | | | Doc: Fixed doc references to non-existing APIGeir Vattekar2010-10-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13632 Reviewed-by: David Boddie
| | * | | | | | | | | Doc: Fix broken links in QSslConfigurationGeir Vattekar2010-10-061-3/+4
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14213 Reviewed-by: David Boddie
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-062-2/+2
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-061845-6418/+14930
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-0648-353/+789
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | Doc: Fixing bug in QML tutorialMorten Engvoldsen2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code snippet for the simple button was not correctly linked.
| | | * | | | | | | | | | Doc: Fixing spacing bug in columnsMorten Engvoldsen2010-10-061-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Added installation section and fixed some whitespace.Jerome Pasion2010-10-061-36/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | | | | | | | | | Merge branch '13092010doc' into 4.7Jerome Pasion2010-10-061-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |