summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * QFSFileEngine compile fix for Windows with VS2005Joerg Bornemann2009-08-211-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch 'master' of git@scm:qt/qt-s60-publicaxis2009-08-211534-6350/+94573
|\ \ | |/ |/| | | This brings support for the S60 platform into Qt.
| * Fixed compile error.axis2009-08-211-1/+1
| |
| * Merge branch 'master' of git@scm:qt/qt-s60-public into master-s60axis2009-08-211-12/+0
| |\
| | * remove the old .pri files, forgotEspen Riskedal2009-08-211-12/+0
| | |
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-2190-228/+5506
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-216-112/+249
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_unix.cpp src/corelib/plugin/qlibrary.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-2123-285/+737
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess.h
| * \ \ \ 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
| * | | | | | | compile again after QESDP fixHarald Fernengel2009-08-211-1/+1
| | | | | | | |
| * | | | | | | compile again with QExplicitlySharedDataPointerHarald Fernengel2009-08-213-12/+12
| | | | | | | |
| * | | | | | | Fixing cause for failing network tests on Symbian.Aleksandar Sasha Babic2009-08-211-10/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that using "qt_safe_XXX" calls is causing troubles on S60. For now we will use "clean" "::XXX" calls instead. They will be ifdefd. Must look deeper what is the real cause: 1. Open C issues 2. issues with atomics 3. flaws in design
| * | | | | | | Cleaning test cases.Aleksandar Sasha Babic2009-08-211-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some situations we had different setup on Symbian platform. Moslty when it comes to the timing issues. We want to revert those where possible.
| * | | | | | | Removing #ifdef guards around inlcude statements.Aleksandar Sasha Babic2009-08-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This header files hould be present on all platforms.
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-211-5/+4
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-212-3/+3
| | |\ \ \ \ \ \ \
| | * | | | | | | | Updated flawed comment after 5365c1cdJanne Anttila2009-08-211-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Miikka Heikkinen
| * | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-21388-36626/+17175
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
| * | | | | | | | | More qpixmap*.cpp fixes for QExplicitlySharedDataPointer.Jason Barron2009-08-212-3/+3
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this fixes the remaining issues.
| * | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-21207-2674/+5187
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix qpixmap*.cpp after latest QExplicitlySharedDataPointer changes.Jason Barron2009-08-204-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static_cast'ing this pointer type is not possible. You must call data() or constData() to get the actual pointer to cast.
| | * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-203-1/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix build error when Q_WS_S60 is undefinedIain2009-08-202-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jason Barron
| | | * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicIain2009-08-20154-2426/+4964
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix build problem when Q_WS_S60 is undefinedIain2009-08-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jason Barron
| | * | | | | | | | | | Fix errors in commit d4c0be3bShane Kearns2009-08-202-3/+3
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: jbarron
| | * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-20178-2488/+4992
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Make qregexp.cpp compile with RVCT.Jason Barron2009-08-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C++ standard says that templates do not consider non-exported operators, but most compilers ignore that rule. RVCT however, does not so add the Q_STATIC_GLOBAL_OPERATOR macro here which expands to 'inline' for RVCT instead of 'static'. Reviewed-by: Harald Fernengel
generated by cgit v0.12 at 2025-02-27 07:57:09 (GMT)