summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: add style to new search resultsMorten Engvoldsen2010-09-281-1/+79
|
* Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-28129-668/+2199
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-0/+39
| |\
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-28125-634/+2144
| | |\
| | * | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | | |
| * | | Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-282-34/+3
| | |/ | |/|
| * | Doc: Fixing QTBUG-13595Morten Engvoldsen2010-09-281-0/+3
| | |
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2722-57/+220
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-272-1/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add export to QDeclarativeBasePositioner Fix assert when placing a .qml file inside $QTDIR/imports
| | | * | Add export to QDeclarativeBasePositionerMarco Bubke2010-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | Bauhaus needs this export to manage layouts.
| | | * | Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assert "Internal error: Plugin imported previously with different uri" happens on Windows. $QTDIR\imports, which is prefixed to the search path, is still written with backslashes. Unify this to forward slashes for all paths. Task-number:QTBUG-13994 Reviewed-by: mae
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-276-45/+54
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Moved the partial deployment section to qbase.pri. Made the Symbian menu close when switching native focus.
| | | * | | Moved the partial deployment section to qbase.pri.axis2010-09-274-45/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way it will be available to all modules, not just selected ones. RevBy: Miikka Heikkinen
| | | * | | Made the Symbian menu close when switching native focus.axis2010-09-272-0/+37
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was required to avoid windows appearing on top of the popup menu, preventing both the menu and the softkeys from being used. Task: QTBUG-9965 AutoTest: Included RevBy: Jason Barron
| | * | | Merge branch 'staging' into 4.7-integrationQt Continuous Integration System2010-09-2714-11/+164
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * staging: Document PropertyAnimation::targets property Fix test. Small fixes to Browser.qml More declarative autotests. Fix example.
| | | * | Document PropertyAnimation::targets propertyBea Lam2010-09-271-1/+8
| | | | |
| | | * | Fix test.Michael Brasser2010-09-271-0/+4
| | | | |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2612-10/+152
| | | |\ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2612-10/+152
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2412-10/+152
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2412-10/+152
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | | | | * | Small fixes to Browser.qmlJoona Petrell2010-09-241-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - focus highlight should not be shown if user presses any physical key, only when up, down, left and right arrow keys are pressed - hybrid devices (touch + four-way rocker) showed two highlight at the same time after using rocker and pressing the screen with finger - touch highlight had gradient, focus highlight one didn't - the width of the focus highlight didn't update when listview changed size (for example after orientation change) Task-number: Reviewed-by: Martin Jones
| | | | | | * | More declarative autotests.Michael Brasser2010-09-2410-2/+110
| | | | | | | |
| | | | | | * | Fix example.Michael Brasser2010-09-241-1/+1
| | | | | | | |
| * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-265-55/+71
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-261-8/+11
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QHostInfo: Fix a crash when a new request is pushed while resolving.
| | | * | | | | QHostInfo: Fix a crash when a new request is pushed while resolving.Jocelyn Turcotte2010-09-261-8/+11
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loop looking for posponedLookup in the lookup thread wasn't locking the mutex before trying to access/modify the list. Reviewed-by: Andreas Kling
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-264-47/+60
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a compilation issue of tst_qsettings for win32-msvc. fix RSS listing example
| | | * | | | Fix a compilation issue of tst_qsettings for win32-msvc.Liang Qi2010-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to include advapi32 for seperate usage of registry functions. Reviewed-by: Marius Storm-Olsen
| | | * | | | fix RSS listing examplePeter Hartmann2010-09-243-47/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by handling HTTP 30X responses and using QNetworkAccessManager instead of QHttp. The server now sends back a HTTP 302 instead of a 200. Reviewed-by: Markus Goetz Task-number: QTBUG-13892
| * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2495-501/+1824
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-09-2411-5/+332
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2
| | | * | | | | Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2Simon Hausmann2010-09-2411-5/+332
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes Jay's fix for the JSC memory consumption on Symbian https://bugs.webkit.org/show_bug.cgi?id=34349 See also commit 03b7a3cffba609df56b4ccadacae6b6f985e96e9
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-246-25/+20
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QML Debugging: Documentation fixes dist/changes: QML Debugging changes Updated changes-4.7.1. Do not set DESTDIR to the current directory Fix dependency on the plugins rule for multimedia
| | | * | | QML Debugging: Documentation fixesLasse Holmstedt2010-09-241-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many things have changed with QML debugging in Qt Creator. Now docs simply refer to Qt Creator documentation. Reviewed-by: Leena Miettinen
| | | * | | dist/changes: QML Debugging changesLasse Holmstedt2010-09-241-1/+5
| | | | | |
| | | * | | Updated changes-4.7.1.Kim Motoyoshi Kalland2010-09-241-1/+3
| | | | | |
| | | * | | Do not set DESTDIR to the current directoryDenis Dzyubenko2010-09-243-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting DESTDIR=. shows an error from mv trying to move the file from the current directory to the same current directory. Reviewed-by: axis
| | | * | | Fix dependency on the plugins rule for multimediaAndy Shaw2010-09-241-1/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When configuring with -no-multimedia then the plugins rule should not be depending on multimedia, otherwise it will not try and build any plugins. Task-number: QTBUG-13912 Reviewed-by: Rohan McGovern
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-245-8/+23
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Assistant: Don't register internal doc when using custom collection. Assistant: Move comment to the right place.
| | | * | | Assistant: Don't register internal doc when using custom collection.Christian Kandeler2010-09-234-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intended to keep the internal documentation out of the "custom help viewer" use case, where it does not belong. Reviewed-by: kh1
| | | * | | Assistant: Move comment to the right place.Christian Kandeler2010-09-231-5/+7
| | | |/ /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-244-114/+125
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed floating point overflow issues in QRasterizer::rasterizeLine Fixed scaled point drawing with square cap in raster paint engine. Don't try to use the texture_from_pixmap extension in GL on desktop/X11.
| | | * | | Fixed floating point overflow issues in QRasterizer::rasterizeLineSamuel Rødal2010-09-232-61/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 7c673a4cf64ba04 introduced some autotest failures in the fpe_steepSlopes test in QPainter. Since the other rasterizers all deal in a 26.6 fixed point coordinate space we should snap the line vertices to this to prevent floating point overflows due to very steep slopes. This also necessitates keeping track of four different slope / inverse slope increments for each of the four edges. This also fixes a previously QEXPECT_FAIL'ed test case. Task-number: QTBUG-13429 Reviewed-by: Trond
| | | * | | Fixed scaled point drawing with square cap in raster paint engine.Samuel Rødal2010-09-232-24/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a large pen width and a small scale, due to the hacky way we draw points (stroking a line from (x, y) to (x + tiny_amount, y)), we some times end up snapping these two points to the same in rasterizeLine(). If we instead apply the SquareCap before we do clipping / snapping we don't get this problem. Task-number: QTBUG-13429 Reviewed-by: Trond
| | | * | | Don't try to use the texture_from_pixmap extension in GL on desktop/X11.Trond Kjernåsen2010-09-232-29/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are far too many problems with this extension for it to be usable on desktop at the moment, so disable on desktop GL for now. It's still enabled for EGL, where it seems to have better driver support. Task-number: related to QTBUG-11158 Reviewed-by: Samuel
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-247-34/+98
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Disallow patching capabilities of executables Made it more clear what the okToRun function does by renaming it. Fixed event starvation on Symbian if timers were constantly recreated Fixed deployment when using shadow builds. Marked a test as XFAIL on Symbian. Made posted events part of the round robin queue. Avoid OpenVG rendering errors when stroking an aliased path.
| | | * | | Disallow patching capabilities of executablesMiikka Heikkinen2010-09-232-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of the assigned capabilities of executables are likely to be actually needed unlike those of dlls, so do not create a patched sis for an application with non-self-signable capabilities. Similarly block creation of a patched package if any executable has a protected range SID, as installer will refuse to install such a package anyway. Task-number: QTBUG-13886 Reviewed-by: Janne Koskinen
| | | * | | Merge branch 'eventStarvationFixes' into 4.7-s60axis2010-09-234-16/+59
| | | |\ \ \
| | | | * | | Made it more clear what the okToRun function does by renaming it.axis2010-09-232-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it has the side effect of possibly adding the object to the deferred run queue, this name is more appropriate. AutoTest: Passed RevBy: mread
generated by cgit v0.12 at 2025-08-16 12:32:03 (GMT)