summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-2123-285/+737
|\ | | | | | | | | Conflicts: src/corelib/io/qprocess.h
| * adjust auto.pro to the recent split of qstringbuilder testshjk2009-08-211-1/+4
| | | | | | | | Reviewed-by: cduclos
| * improve error reporting for map/unmap of files and resourcesRitt Konstantin2009-08-213-12/+8
| | | | | | | | | | Merge-request: 833 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * QFile: unset errorString as well as errorRitt Konstantin2009-08-211-3/+3
| | | | | | | | | | | | | | Prefer using unsetError() since it unsets both error and errorString. Merge-request: 833 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * QFile: use fileEngine's errorString() instead of errno/GetLastError()Ritt Konstantin2009-08-213-29/+61
| | | | | | | | | | | | | | | | QFile behaves like wrapper for file engine in most operations, so proper error reporting must be implemented in file engine backends. Merge-request: 833 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * QFSFileEngine: fix inverted logic for return valuesRitt Konstantin2009-08-211-5/+5
| | | | | | | | | | Merge-request: 833 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * Oops: fix compilerSupportsFlag: must return $ret, not $?Thiago Macieira2009-08-211-1/+1
| |
| * Execute some small performance improvements in QProcessEnvironmentThiago Macieira2009-08-212-5/+11
| | | | | | | | | | | | | | | | If d == 0, then we know we have no items. Therefore, removing or clearing is an idempotent action. So instead of detaching, leave d == 0. In the search function, avoid converting the defaultValue to the internal representation.
| * Document the new QProcessEnvironment classThiago Macieira2009-08-212-3/+166
| |
| * Remove the xxxRaw versions of the QProcessEnvironment functions.Thiago Macieira2009-08-212-30/+2
| | | | | | | | | | If we ever decide we need them later, we can readd. For the moment, let's keep the QString versions only.
| * Add the reason for a process's failure to start to the errorStringThiago Macieira2009-08-211-1/+4
| | | | | | | | | | It would have been of great help to find this out when I was debugging the previous commit.
| * Add a new class for handling a process's environment variables.Thiago Macieira2009-08-217-86/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, make it a lot easier to access individual variables by having them in an associative container (a QHash). This fixes task 232427, albeit one release later than I had originally planned. On Windows, the variable names in the environment are case-insensitive, so a direct QHash isn't a good solution. Implement code that does the uppercasing on Windows and leaves untransformed on other platforms. Since we're doing this anyways, use QByteArray on Unix systems, since, in theory, the environment could contain any random binary data, which is not representable in QString. Task-number: 232427
| * Improved a QGesture api a little bit.Denis Dzyubenko2009-08-216-63/+88
| | | | | | | | | | | | | | Changed the constructor of the QGesture to separate the gesture target (the object/widget that the gesture filters events for), and the parent object. Reviewed-by: Richard Moe Gustavsen
| * Improved the QPanGesture implementation.Denis Dzyubenko2009-08-211-16/+18
| | | | | | | | | | | | | | When Pan is implemented with touch events, make sure it pans only when two fingers are used. Reviewed-by: trustme
| * Fixed gesture handling on Windows when there are no alien widgetsDenis Dzyubenko2009-08-211-4/+13
| | | | | | | | | | | | Use the proper winid to set gesture configuration to. Reviewed-by: trustme
| * Dont create native windows when setting up gestures.Denis Dzyubenko2009-08-213-64/+82
| | | | | | | | | | | | | | | | | | | | | | | | The code used to create native window handle even before checking if the widget subscribes to gestures, basically breaking alien widgets. Check the position of the gesture instead when the WM_GESTURE message is received in the GID_BEGIN state. This will work properly in most cases - but not always as the position that we get with the WM_GESTURE message is the center point of the multitouch gesture, which might be outside of the widget depending on positions of fingers. Reviewed-by: trustme
| * Doc - Clarified the use of layoutChanged() in relation to persistentKavindra Devi Palaraja2009-08-211-1/+10
| | | | | | | | | | | | | | | | model indexes Reviewed-By: Olivier Goffart Task: 231608
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-2128-44/+63
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicEspen Riskedal2009-08-211-1/+1
| |\ \
| | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Harald Fernengel2009-08-217-58/+42
| | |\ \ | | | | | | | | | | | | | | | master-origin
| | * | | compile.Harald Fernengel2009-08-211-1/+1
| | | | |
| * | | | Rename demobase.pri to symbianpkgrules.priEspen Riskedal2009-08-2127-43/+62
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | demobase.pri sounded to generic, also I changed it to error on !symbian platforms, and test all the places we include it. That makes it more obvious when reading the .pro files that this is actually Symbian spesific stuff, not cross-platform Qt rules. Reviewed-by: axis
* | | | Merge commit 'qt/master'Jason Barron2009-08-2138-200/+325
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | get rid of qmake warnings when parsing script.pro (JavaScriptCore.pri)Kent Hansen2009-08-211-0/+9
| | |
| * | Fix memory leakOlivier Goffart2009-08-212-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the variant is invalid the shared is not destroyed. We even can avoid the creation of the PrivateShared if we know the variant is invalid Reviewed-by: Thierry
| * | Optimize contrcuction of variant of type pointer.Olivier Goffart2009-08-213-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructing a variant of a pointer type was previously quite slow: QVariant had no information it was a pointer. It had to create a QVariant::PrivateShared, ask the QMetaType for a constructor (slow as it involve locking mutextes) and allocate a pointer. By detecting a pointer in qVariantFromValue, we can store the pointer value dirrectly in the Variant union. We then avoid 2 allocations, and the expensive locking in QMetaType::construct Reviewed-by: Thierry
| * | qdoc: Moved javascripts for search box from header to footer.Martin Smith2009-08-211-6/+6
| | | | | | | | | | | | This is meant to speed up loading the landing page. But does it work?
| * | Add documentation for Qt::AnchorPointJan-Arve Sæther2009-08-211-0/+18
| | |
| * | qdoc: Redesigned the Class and Function Documentation page.Martin Smith2009-08-2112-97/+129
| | |
| * | Make QEglContext::extensions() staticTom Cooksey2009-08-212-3/+3
| | | | | | | | | | | | | | | | | | This is private API Reviewed-By: Trustme
| * | Add a static QEglProperties::dumpAllConfigs()Tom Cooksey2009-08-212-0/+16
| | | | | | | | | | | | | | | | | | This is private API Reviewed-By: Trustme
| * | Fix QGLWidget::showFullScreen() on X11/EGLTom Cooksey2009-08-211-2/+5
| | | | | | | | | | | | | | | | | | It seems the winId can change during a WindowStateChange event too. Reviewed-By: Trustme
| * | Removed PBO texture upload from QGLContextPrivate::bindTexture().Samuel Rødal2009-08-212-41/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The PBO code path causes a crash on certain AMD graphics cards, plus seems to perform worse than the straight forward glTexImage2D code path on several configurations. Task-number: 257353 Reviewed-by: Gunnar Sletta
| * | rename QEventTransition::eventObject to eventSourceKent Hansen2009-08-213-14/+14
| | | | | | | | | | | | | | | | | | eventObject was a horrible name. The documentation already used the term "event source", so let's call it that. Agreed with Eskil.
| * | move qdoc3 binary to bin, so we can use it for Qt Creator without hacks.Daniel Molkentin2009-08-214-2/+5
| | | | | | | | | | | | | | | | | | | | | Most Linux distributions already move qdoc3 to that place for exactly this reason anyway. Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-08-21469-38009/+24240
| |\ \
| | * | Fix linking to uninstalled libraries after LIBS_PRIVATE.Thiago Macieira2009-08-211-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On ELF systems, the static linker isn't allowed to find a linked library's dependencies using the -L flag. That means if you're linking lib or app X against a library A, and library A links against library B, then -L$QTDIR/lib won't apply to B. Before LIBS_PRIVATE, we had -lB, so it did apply. Now we need to find another solution. The solution is one of: a) install the libraries before linking anything against them b) set LD_LIBRARY_PATH c) set -rpath or -rpath-link Reviewed-by: TrustMe
| | * | Doc fixes to anchor layout.Jan-Arve Sæther2009-08-211-6/+6
| | | |
| | * | Doc fixes.Jan-Arve Sæther2009-08-211-1/+2
| | | |
| | * | Autotest QEXPECTED_FAIL removedJedrzej Nowacki2009-08-211-3/+1
| | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen
| | * | JSC::Debugger fix. Events exceptionThrow and functionExit modificationJedrzej Nowacki2009-08-211-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSC::Debugger::exceptionThrow event was moved _before_ stacks unwinding so there is possibility to check stack state before it's deletion. Missing functionExit event was added in Interpreter::unwind() Reviewed-by: Kent Hansen
| | * | Another typo.Alexis Menard2009-08-211-1/+1
| | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| | * | Fix typo in anchor layout documentation.Alexis Menard2009-08-211-1/+1
| | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| * | | Reset clip structure when we use Qt::ReplaceClip or Qt::NoClipGunnar Sletta2009-08-211-0/+8
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
* | | | Remove changes from bad merge.Jason Barron2009-08-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | This was related to e93ffdbb6fde611defc34fd27aec25c40da5a60e. Again, this most likely happened when switching between 4.5 and 4.6 and resolving some conflict incorrectly.
* | | | Remove commented-out code from examples.axis2009-08-211-4/+0
| | | | | | | | | | | | | | | | RevBy: Trust me
* | | | Removed an example that was listed twice.axis2009-08-211-1/+0
| | | | | | | | | | | | | | | | RevBy: Espen Riskedal
* | | | Fixes: Missing deployment of backends for phonon examplesaxis2009-08-212-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Joerg Details: deployment of waveout and direct show backend Conflicts: examples/phonon/capabilities/capabilities.pro examples/phonon/musicplayer/musicplayer.pro (Cherry-pick of d6cfcd22472128cc68c75a7e24791a909082732f)
* | | | Revisiting test cases.Aleksandar Sasha Babic2009-08-211-48/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some values (timeouts) could be trimmed to be the same as on the other platforms. Others are different as we have to remember that Symbina is embedded pltform and that usually tests run in the emulator. Things need more time then. Reviewed-by: TrustMe
* | | | Rebuild configure.exe.Jason Barron2009-08-211-0/+0
| |_|/ |/| | | | | | | | This binary was built with MSVC2008 and the /MT option.