summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: updating details on Tier 2 platformsMorten Engvoldsen2010-09-071-5/+4
|
* Doc: adding remark on release of qt quick element support in creatorMorten Engvoldsen2010-09-071-1/+2
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-09-0736-331/+1198
|\
| * Replaced QWeakPointer to *Pointer in QGestureManager.Dominik Holland2010-09-072-3/+4
| | | | | | | | | | | | | | | | | | | | The QWeakPointer was part of a key in a QMap. When the QWeakPointer gets deleted, the key changes and the sorting of the Map was wrong. That leads to an random crash. It should be safe not to use QWeakPointer as we remove pointers from the objectGestures map when a widget or graphicsitem gets destroyed. Reviewed-by: Denis Dzyubenko
| * Fixed hiding a window on X11 before it was shown.Denis Dzyubenko2010-09-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | On X11 show() just issues a request to show a window, so if someone tries to call hide() before the window was successfully mapped to the screen by the window manager it will not work (on most window managers unfortunately). So instead, when hide() is called we internally mark the window as "no need to show anymore" and then if we still get MapNotify event, we will hide the window right away. Reviewed-by: Markus Goetz Reviewed-by: Bradley T. Hughes
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jason McDonald2010-09-075-17/+73
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-075-17/+73
| | |\ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Pause orientation sensors in Qml Viewer when the application window is not active
| | | * Pause orientation sensors in Qml Viewer when the application window is not ↵Joona Petrell2010-09-075-17/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | active Task-number: QTBUG-13347 Reviewed-by: Martin Jones
| * | | Fix incorrect license header.Jason McDonald2010-09-071-8/+8
| |/ / | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-071-0/+1
| |\ \ | | |/ | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Increase maximum heap size of minehunt demo to fix crashing on Symbian
| | * Increase maximum heap size of minehunt demo to fix crashing on SymbianJoona Petrell2010-09-071-0/+1
| |/ | | | | | | | | Task-number: QT-3821 Reviewed-by: Martin Jones
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-064-105/+229
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Allow Windows x64 to use SSE2 to speed up blending
| | * Allow Windows x64 to use SSE2 to speed up blendingliang jian2010-09-064-105/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows 64 does not support MMX with MSVC. This is a problem with the way SSE is currently used because it rely on previous vector instructions being available. This patches fixes that by using the intended functions for SSE2 on Windows. Merge-request: 792 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0654-1332/+3390
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits) make shadow builds not write into the source dir Fix failing tst_qmdisubwindow test after 71a3b1a0d3 Doc: update the documentation of QUrl about HTML Form encoding search translator comments Install translators earlier in assistant Fix compilation on ARM: don't include kernel headers Fix compilation of qmake with MSVC Doc: Updating known-issues page. Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments ...
| | * make shadow builds not write into the source dirOswald Buddenhagen2010-09-061-9/+17
| | | | | | | | | | | | like mkspecs/features, mkspecs/modules needs special treatment.
| | * Fix failing tst_qmdisubwindow test after 71a3b1a0d3Tor Arne Vestbø2010-09-061-2/+4
| | | | | | | | | | | | Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-065-12/+102
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed incorrect Symbian scoping. Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2 QPixmaps try to access FBS connection after the connection has been closed.
| | * | Fixed incorrect Symbian scoping.axis2010-09-061-2/+2
| | | | | | | | | | | | | | | | The missing install functionality is only true for mmp based systems.
| | * | Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2Miikka Heikkinen2010-09-062-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No longer require PRE_TARGETDEPS items to be absolute, which was difficult to achieve sometimes as qmake doesn't provide method for absolutizing paths. - Do smart command replacement for commands containing $$QMAKE_* command variables, such as $$QMAKE_COPY, when generating bld.inf extensions for QMAKE_EXTRA_* variables. $$QMAKE_* command variables cannot be passed to sbsv2 toolchain directly, as it uses cygwin in windows, and they can't simply be replaced to use sbsv2 equivalents in symbian.conf, because generated wrapper makefiles need them to be Windows compatible. Reviewed-by: axis
| | * | QPixmaps try to access FBS connection after the connection has been closed.Jani Hautakangas2010-09-062-2/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixed the issue by tracking pixmaps and destroying native bitmaps before FBS connection is closed. Task-number: QTBUG-9112 Reviewed-by: Jason Barron
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-0615-175/+753
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix AnchorAnimation for multiple AnchorChanges with dependancies. Fix recording of QML visual tests when using a QGLWidget viewport. Fix PathView item position on insertion and removal. Small cleanup Ensure WebView gets focus when an editable node is clicked on. Ensure slider is updated when screen size changes. Do not reset sourceSize when changing image source url. Ensure all image state is updated before emitting changed signals.
| | * | | Fix AnchorAnimation for multiple AnchorChanges with dependancies.Michael Brasser2010-09-065-16/+518
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rewinding, don't reapply bindings, only values. This is consistent with how we handle rewinding other property bindings. Task-number: QTBUG-13398
| | * | | Fix recording of QML visual tests when using a QGLWidget viewport.Michael Brasser2010-09-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | In order for the event filter to work, we need to set the QGLWidget as the viewport before constructing the QDeclarativeTester.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-061-7/+5
| | |\ \ \
| | | * | | Small cleanupAaron Kennedy2010-09-061-7/+5
| | | | | |
| | * | | | Fix PathView item position on insertion and removal.Martin Jones2010-09-064-136/+181
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the offset is adjusted to account for the new or removed items. Also minor optimizations to delegate updates. Task-number: QTBUG-13416
| | * | | Ensure WebView gets focus when an editable node is clicked on.Martin Jones2010-09-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13342 Reviewed-by: Michael Brasser
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-061-3/+0
| | |\ \ \
| | | * | | Do not reset sourceSize when changing image source url.Yann Bodson2010-09-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13383
| | * | | | Ensure slider is updated when screen size changes.Martin Jones2010-09-062-6/+38
| | |/ / / | | | | | | | | | | | | | | | Task-number: QT-3718
| | * | | Ensure all image state is updated before emitting changed signals.Martin Jones2010-09-061-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statusChanged() was emitted before the size was set, so if you did, e.g. if (width != 0) in onStatusChanged it would get the wrong width. Task-number: QT-3820 Reviewed-by: Yann Bodson
* | | | | Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-0713-106/+126
| |_|_|/ |/| | | | | | | | | | | | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly
* | | | Doc: update the documentation of QUrl about HTML Form encodingThiago Macieira2010-09-061-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTML forms deviate slightly from URL encoding. They encode spaces as plus signs (+) and the plus sign is encoded as %2b. QUrl is a strict URL/URI tool, so it does not know about HTML form encoding. Add a note to the methods that encode/decode queries about this difference. Task-number: QTBUG-13403
* | | | search translator commentsOswald Buddenhagen2010-09-061-0/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-4165
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0653-1323/+3349
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) Install translators earlier in assistant Fix compilation on ARM: don't include kernel headers Fix compilation of qmake with MSVC Doc: Updating known-issues page. Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian ...
| * | | Install translators earlier in assistantVictor Ostashevsky2010-09-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Help message and command line parsing errors will be shown translated Merge-request: 2466 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Fix compilation on ARM: don't include kernel headersThiago Macieira2010-09-061-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kernel headers are sometimes evil that they are incompatible or missing. At least one toolchain on ARM doesn't have them, so don't include. Instead, copy the definitions. The kernel ABI is stable so these values won't change on us. Reviewed-by: Benjamin Poulain
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-09-061-4/+0
| |\ \ \
| | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-09-0640-336/+345
| | |\ \ \
| | * | | | Doc: Updating known-issues page.Morten Engvoldsen2010-09-061-4/+0
| | | | | |
| * | | | | Fix compilation of qmake with MSVCAndy Shaw2010-09-061-2/+3
| | |/ / / | |/| | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0651-1314/+3332
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC ...
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0351-1314/+3332
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC ...
| | | * | | Recognize @, #, $ and ` as word separatorsThorbjørn Lindeijer2010-09-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behavior of Qt with these characters was different than other toolkits, which annoys some people. Task-number: QTCREATORBUG-2241 Reviewed-by: mae
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0350-1314/+3328
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC Rewrite ucstrcmp in terms of ucstrncmp ...
| | | | * | | rebuild configure.exePeter Hartmann2010-09-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | after change 0c7d5d10615, "Symbian: Disable IPv6 for now"
| | | | * | | Fix dependencies so JOM will handle parallellization properlyMarius Storm-Olsen2010-09-031-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JOM wouldn't wait for qmake_pch.obj to finish before starting the other compiles. Reviewed-by: trustme
| | | | * | | Symbian: Disable IPv6 for nowMarkus Goetz2010-09-032-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenC does not fully support IPv6, therefore we cannot either. Reviewed-by: ogoffart
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-09-0350-827/+3321
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Doc: Fixing links on index page and corecting HTML in the template.Morten Engvoldsen2010-09-032-2/+2
| | | | | | |