summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Merge branch 'reviewPatches'axis2009-08-215-50/+15
|\ \ \
| * | | Revert "Fixed KERN-EXEC 3 panic on ARMV5 builds caused by combining trinary ↵axis2009-08-211-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operators and 64 bit values in QVariant. This is probably a compiler bug. Workaround is flagged with Q_CC_RVCT specific just in case, but should work for all compilers." This reverts commit 85a1f7888bd48d5857de2b7c6304a334350fd054. Conflicts: src/corelib/kernel/qvariant.cpp tests/auto/qvariant/qvariant.pro I cannot reproduce this anymore with the latest RVCT, not even in S60 3.1. RevBy: Miikka Heikkinen
| * | | Switched to logical comparison instead of bitwise.axis2009-08-212-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done because I initially thought that KRequestPending was a bit flag, but it turns out it's just an int value, so == is more correct. RevBy: Iain AutoTest: Passed
| * | | Fixed documentation.axis2009-08-211-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Private directory is not always in C-drive. RevBy: Trust me
| * | | Fixed some comments and code style issues after review.axis2009-08-213-9/+7
| | | | | | | | | | | | | | | | RevBy: Trust me
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-212-5/+4
|\ \ \ \
| * | | | Fixing compile issue on platforms other than Symbian.Aleksandar Sasha Babic2009-08-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had a "typo", probelmatic line have be just swaped. Reviewed-by: jbarron
| * | | | Remove QtScript from deployed libraries.axis2009-08-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not currently supported anymore after QtScript switched to the JavaScriptCore backend. RevBy: Trust me
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-218-88/+14
|\ \ \ \ \ | |/ / / /
| * | | | compile again after mergeHarald Fernengel2009-08-218-88/+14
| | | | |
* | | | | Merge commit 'qt/master'Jason Barron2009-08-2121-21/+4976
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | Conflicts: examples/graphicsview/graphicsview.pro
| * | | Handle Touch* events in the same way as other input events in ↵Bradley T. Hughes2009-08-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractScrollArea We send the Touch* events filtered from the viewport to the scroll area's default handler so that we can take advantage of the default handling in QWidget. But we also need to ignore Touch* events in QAbstractScrollArea::event() so that we don't get the events twice (once from the filter, and again if propagated). Reviewed-by: Richard Moe Gustavsen
| * | | Convert the screen cursor image to native premultiplied formatPaul Olav Tvete2009-08-211-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default cursor on QWS is loaded as an 8bit QImage. Blitting that one is really slow so we better convert the image into a fast format before using it. Based on a patch by Lars. Reviewed-by: Tom
| * | | Allow linuxfb device names like /dev/fb/0Takumi ASAKI2009-08-211-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | Previously, length of linuxfb device's path must be 8 and start with "/dev/fb". Reviewed-by: Paul
| * | | Avoid painting window decorations flicker showPaul Olav Tvete2009-08-211-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Request focus before requesting a geometry. This makes it much more likely that the initial paint will be done after the window is active. Task-number: 255828 Reviewed-by: Tom
| * | | Fix blend function crash on AVR32Paul Olav Tvete2009-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AVR32 doesn't support non-aligned access. (Contributed patch) Task-number: 255495 Reviewed-by: Paul
| * | | make the new anchor layout code compile with namespaceshjk2009-08-216-5/+29
| | | |
generated by cgit v0.12 at 2025-08-16 15:03:03 (GMT)