summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-25284-13975/+13795
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-25284-13972/+13784
| |\
| | * Use QTRY_COMPARE after QTest::qWaitForWindowShown()Kent Hansen2010-03-251-1/+1
| | * Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-253-2/+30
| | * QtScript: Add API for reporting additional memory costsKent Hansen2010-03-255-3/+81
| | * Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
| | * Fix misspelling in function name.Fabien Freling2010-03-251-2/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-25226-3447/+2531
| | |\
| | | * Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-25226-3447/+2531
| | | |\ | | |_|/ | |/| |
| | * | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| | |/
| | * Fix CI sytem build breakage.Morten Johan Sørvig2010-03-251-0/+0
| | * Fix crash.Aaron McCarthy2010-03-251-1/+1
| | * Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-2520-24/+67
| | * Don't emit signals in constructor.Aaron McCarthy2010-03-252-4/+11
| | * Remove unused code.Aaron McCarthy2010-03-252-212/+113
| | * fix multiple promps for keychain access when connecting to wifi networkLorn Potter2010-03-252-39/+111
| | * not all interfaces should be activeLorn Potter2010-03-251-2/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-24146-1017/+4133
| | |\
| | | * Update changelogThiago Macieira2010-03-241-0/+10
| | | * Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2414-38/+43
| | | |\
| | | * | Fix qcombobox:flaggedItems autotest failure.Thiago Macieira2010-03-242-11/+10
| | | * | Wrong value for PM_ScrollBarExtent on Windows XP.Prasanth Ullattil2010-03-241-1/+1
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-2416-213/+435
| | | |\ \
| | | | * | Do not move keyboard focus to invisible windows on X11.Denis Dzyubenko2010-03-242-6/+2
| | | | * | Do not use _NET_ACTIVE_WINDOW for nonmanaged windows.Denis Dzyubenko2010-03-242-2/+3
| | | | * | Revert "Revert "Make QWidget::activateWindow() NET window manager aware.""Denis Dzyubenko2010-03-243-1/+25
| | | | * | Give 1-pixel splitters a larger grab areaJens Bache-Wiig2010-03-242-1/+32
| | | | * | Redesigned object and class labels for the Designer propertyeditorJens Bache-Wiig2010-03-242-12/+60
| | | | * | Optimization in QJpegHandler to reduce overheadZeno Albisser2010-03-242-188/+215
| | | | * | QtScript: Add QObjectWrapOption for not exposing slotsKent Hansen2010-03-244-1/+91
| | | | * | QtScript: Add more missing API shimsKent Hansen2010-03-242-4/+9
| | | * | | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-2410-175/+196
| | | |/ /
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-2410-190/+92
| | | |\ \
| | | | * | Wrong position for foucs ring when used in QMacNativeWidget.Prasanth Ullattil2010-03-241-2/+3
| | | | * | Fix compile error with QT_NO_HTTPTasuku Suzuki2010-03-241-0/+8
| | | | * | Add unit tests for QTranslator.David Sansome2010-03-243-1/+25
| | | | * | Add a check to make sure QTranslator doesn't load a directory.David Sansome2010-03-241-2/+2
| | | | * | Revert "Optimized QLocale to access system locale on demand."Morten Johan Sørvig2010-03-244-185/+54
| | | * | | doc: Fixed function signatures in qdoc comments.Martin Smith2010-03-241-9/+9
| | | |/ /
| | | * | Revert "Make QWidget::activateWindow() NET window manager aware."Morten Johan Sørvig2010-03-243-25/+1
| | | * | Mac: new auto test: macnativeeventsRichard Moe Gustavsen2010-03-248-0/+1317
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-24229-13332/+11550
| | | |\ \
| | | | * | Bearer management documentation.Aaron McCarthy2010-03-2410-4/+566
| | | | * | Bearer management changes from Qt Mobility (6fb31d1e).Aaron McCarthy2010-03-2414-91/+375
| | | | * | Remove extraneous semi-colon.Aaron McCarthy2010-03-231-1/+1
| | | | * | Use the default codec with QString::vsprintf()Florian Vichot2010-03-232-0/+16
| | | | * | Fix build with QT_NO_DOCKWIDGETBernhard Rosenkraenzer2010-03-232-0/+6
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-23206-13238/+10588
| | | | |\ \
| | | | | * | Fix the test of QDirIterator with NoDot and NoDotDotBenjamin Poulain2010-03-231-3/+3
| | | | | * | Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDotBernhard Rosenkraenzer2010-03-234-3/+61