summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-26296-14116/+13860
| |\
| * | Add missing files from 72599ca45c416f2f0a9654412c14a148ca3d728cAaron Kennedy2010-03-262-0/+167
| | |
* | | Document Particles module import.Martin Jones2010-03-262-1/+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-255-27/+52
|\ \
| * | Fix where data() is called before xml is loaded. Also add status tests.Bea Lam2010-03-252-2/+47
| | |
| * | Clean upBea Lam2010-03-251-20/+0
| | |
| * | Remove int parameter from ListModel countChanged() to be consistentBea Lam2010-03-253-5/+5
| | | | | | | | | | | | with other classes with countChanged() signals.
* | | 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-25284-13970/+13782
|\ \ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-25284-13972/+13784
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (153 commits) Use QTRY_COMPARE after QTest::qWaitForWindowShown() Use the new memory cost reporting API in QtScript Custom Class example QtScript: Add API for reporting additional memory costs Add experimental support for StaticContents in Mac OS X. Fix misspelling in function name. don't just return the first key here. Fix CI sytem build breakage. Fix crash. Compile with QT_NO_NETWORKINTERFACE defined. Don't emit signals in constructor. Remove unused code. fix multiple promps for keychain access when connecting to wifi network not all interfaces should be active Update changelog Fix qcombobox:flaggedItems autotest failure. Wrong value for PM_ScrollBarExtent on Windows XP. doc: Fixed all the remaining qdoc errors. For now. Do not move keyboard focus to invisible windows on X11. Do not use _NET_ACTIVE_WINDOW for nonmanaged windows. Revert "Revert "Make QWidget::activateWindow() NET window manager aware."" ...
| | * | Use QTRY_COMPARE after QTest::qWaitForWindowShown()Kent Hansen2010-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | Apparently it's possible that the window has been shown but haven't received a paint event yet.
| | * | Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-253-2/+30
| | | | | | | | | | | | | | | | Also describe its purpose in the example doc.
| | * | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-255-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QScriptEngine::reportAdditionalMemoryCost(int). This function provides the ability to give a hint to the engine that it should perhaps trigger garbage collection sooner rather than later. For example, if you've implemented a JS ByteArray class that wraps a QByteArray, and a user constructs a few hundred temporary ByteArray objects of large sizes, failure to report the additional memory cost may cause the application's memory consumption to grow and grow (because the script engine thinks they are "cheap" objects, the GC won't kick in). Reporting the correct size can be difficult (or impossible) in some cases. For example, it's difficult to predict the total amount of system memory & resources consumed by a QImage. But even reporting a heuristic / approximate cost can be better than reporting no cost. Task-number: QTBUG-6238 Reviewed-by: Simon Hausmann
| | * | Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
| | | | | | | | | | | | | | | | Reviewed-by: Morten Sorvig
| | * | 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
| | | |\ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| | * | | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| | |/ / | | | | | | | | | | | | this fixes associating..
| | * | Fix CI sytem build breakage.Morten Johan Sørvig2010-03-251-0/+0
| | | | | | | | | | | | | | | | (The .pro file name must match the dir name)
| | * | Fix crash.Aaron McCarthy2010-03-251-1/+1
| | | | | | | | | | | | | | | | Resources are not allocated on error. Only free on success.
| | * | 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
| | | | | | | | | | | | | | | | Task-number: QT-3150
| | * | 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
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/corewlan/qcorewlanengine.mm
| | | * | Update changelogThiago Macieira2010-03-241-0/+10
| | | | |
| | | * | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2414-38/+43
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Four-way merge: take the qt-qml.git#4.7 branch version (which uses fromUtf8). I used QLatin1String, Thierry used QString::fromLatin1. Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
| | | * | | Fix qcombobox:flaggedItems autotest failure.Thiago Macieira2010-03-242-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QElapsedTimer doesn't initialise itself on construction, which means we were actually depending on uninitialised data. QTime does initialise itself to NullTime. This means the test didn't actually work if you ran it precisely at midnight... Reviewed-By: Trust Me
| | | * | | Wrong value for PM_ScrollBarExtent on Windows XP.Prasanth Ullattil2010-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NONCLIENTMETRICSW::iPaddedBorderWidth member is supported only on Windows Vista and above. So when calling the SystemParametersInfo for SPI_GETNONCLIENTMETRICS on Windows XP, the size for that member needs to be removed from NONCLIENTMETRICSW::cbSize. Task-number: QTBUG-8639 Reviewed-by: Thierry
| | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QWidget::activateWindow() is called we check if the window was already mapped and just do not do anything if it wasn't. We used to try to active it by giving it keyboard focus, but that always fails because it isn't allowed to call XSetInputFocus on invisible windows, and the error message was swalled by Qt in the error handler. So now we just don't bother even trying if we know the call will fail. Task-number: QTBUG-4042 Reviewed-by: Benjamin Poulain Reviewed-by: Bradley T. Hughes
| | | | * | | Do not use _NET_ACTIVE_WINDOW for nonmanaged windows.Denis Dzyubenko2010-03-242-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a window has X11BypassWindowManager hint, we shouldn't bother asking the windowmanager to active it using the _NET_ACTIVE_WINDOW protocol and just go though Xorg directly. Reviewed-by: Bradley T. Hughes
| | | | * | | Revert "Revert "Make QWidget::activateWindow() NET window manager aware.""Denis Dzyubenko2010-03-243-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 555175f9d9e5633b8fcfd6e6f6a11c84faa9946e.
| | | | * | | Give 1-pixel splitters a larger grab areaJens Bache-Wiig2010-03-242-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a trick we have applied to Qt Creator for a while and it makes sense to backport this into Qt. Essentially 1-pixel splitters are unusable at the moment. With this fix the actual splitter handle will be 5 pixels wide and slightly overlap neighbouring widgets. The layout code in QSplitter alreadu use the contentsRect to support this behavior. Task-number: QTBUG-9335 Reviewed-by: thierry
| | | | * | | Redesigned object and class labels for the Designer propertyeditorJens Bache-Wiig2010-03-242-12/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We modified the label so that it gets its own row instead of squeezing it into the tool bar. This layout would usually not have room for more than short labels and looked rather unprofessional when used in Creator. The new label is properly elided. We also added a frame to distinguish it from the dock widget label. Reviewed-by: Friedemann Kleint
| | | | * | | Optimization in QJpegHandler to reduce overheadZeno Albisser2010-03-242-188/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Image size and format is only calculated once on first call of readJpegHeader. Further private data has been extracted into QJpegHandlerPrivate. Unfotunately this change only has very little effect. Reviewed-by: aavit Task-number: QTBUG-9091
| | | | * | | QtScript: Add QObjectWrapOption for not exposing slotsKent Hansen2010-03-244-1/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to have a prototype object in place that handles all slot calls, rather than having the slots be recreated in each wrapper object. Task-number: QTBUG-3637 Reviewed-by: Simon Hausmann
| | | | * | | QtScript: Add more missing API shimsKent Hansen2010-03-242-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Their absence was causing Bauhaus to crash. Reviewed-by: Simon Hausmann
| | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This widget is treated as a window by Qt, but with the embedded flag ON. setGeometry should not clip this window, it will be cliped automatically by the parent view of QMacNativeWidget. Task-number: QTBUG-9199 Reviewed-by: Denis
| | | | * | | Fix compile error with QT_NO_HTTPTasuku Suzuki2010-03-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | | * | | Add unit tests for QTranslator.David Sansome2010-03-243-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two new tests: * Check that translations can be loaded from resources * Check that nothing happens when trying to "load" a directory Merge-request: 531 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | | * | | Add a check to make sure QTranslator doesn't load a directory.David Sansome2010-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 531 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | | * | | Revert "Optimized QLocale to access system locale on demand."Morten Johan Sørvig2010-03-244-185/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0d3c62150f2fa2c06f7676336076be4622059cc3, which causes the following (intermittent) test failuers: TESTCASE_FAIL qtconcurrentmap (pulse_qws/linux-x86-g++) TESTFUNCTION_FAIL qtconcurrentmap::mapped (pulse_qws/linux-x86-g++)
| | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6390248b11b3596d8c946c232e9b0d832dc42941, which caused the following regressions: TESTFUNCTION_FAIL qshortcut::ambiguousItems (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::ambiguousRotation (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::disabledItems (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::keypressConsumption (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::number (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::text (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::unicodeCompare (pulse_linux-g++)
generated by cgit v0.12 at 2025-08-26 06:39:10 (GMT)