summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Really fix qMin() parameter types.Martin Jones2010-03-261-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-262-0/+167
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-26183-3430/+8151
| |\
| * | Add missing files from 72599ca45c416f2f0a9654412c14a148ca3d728cAaron Kennedy2010-03-262-0/+167
* | | Document Particles module import.Martin Jones2010-03-261-0/+5
| |/ |/|
* | Remove some Script {} docsMartin Jones2010-03-254-105/+12
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-254-27/+9
|\ \
| * | Fix where data() is called before xml is loaded. Also add status tests.Bea Lam2010-03-251-2/+4
| * | Clean upBea Lam2010-03-251-20/+0
| * | Remove int parameter from ListModel countChanged() to be consistentBea Lam2010-03-253-5/+5
* | | Ensure both qMin() parameters are the same type.Martin Jones2010-03-251-1/+1
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-25173-3288/+8120
|\ \
| * | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-254-3/+62
| * | 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-2579-1242/+1127
| |\ \
| | * \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2579-1242/+1127
| | |\ \
| * | | | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| |/ / /
| * | | Fix crash.Aaron McCarthy2010-03-251-1/+1
| * | | Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-2515-18/+40
| * | | 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-2483-712/+852
| |\ \ \
| | * \ \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2410-24/+24
| | |\ \ \
| | * | | | 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-2412-200/+287
| | |\ \ \ \
| | | * | | | 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-241-1/+2
| | | * | | | 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
| | | * | | | Optimization in QJpegHandler to reduce overheadZeno Albisser2010-03-242-188/+215
| | | * | | | QtScript: Add QObjectWrapOption for not exposing slotsKent Hansen2010-03-243-1/+4
| | | * | | | QtScript: Add more missing API shimsKent Hansen2010-03-242-4/+9
| | * | | | | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-246-120/+142
| | |/ / / /
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-246-183/+67
| | |\ \ \ \
| | | * | | | 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 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-243-179/+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
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-24146-2728/+7513
| | |\ \ \ \
| | | * | | | Bearer management documentation.Aaron McCarthy2010-03-243-3/+3
| | | * | | | Bearer management changes from Qt Mobility (6fb31d1e).Aaron McCarthy2010-03-2411-54/+153
| | | * | | | Remove extraneous semi-colon.Aaron McCarthy2010-03-231-1/+1
| | | * | | | Use the default codec with QString::vsprintf()Florian Vichot2010-03-231-0/+11
| | | * | | | Fix build with QT_NO_DOCKWIDGETBernhard Rosenkraenzer2010-03-232-0/+6