summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | 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 commit 'qt/master'Jason Barron2009-08-211-0/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/graphicsview/graphicsview.pro
| * \ \ \ \ \ \ \ \ \ Merge commit 'qt/master'Jason Barron2009-08-213-21/+22
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Fix errors in commit d4c0be3bShane Kearns2009-08-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: jbarron
| * | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-2025-609/+815
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | 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
| | * | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-206-8/+13
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | compile when bootstrapping QtHarald Fernengel2009-08-201-0/+2
| | | | | | | | | | | | |
| | | * | | | | | | | | | Use QExplicitlySharedDataPointerHarald Fernengel2009-08-203-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | part of the task to get rid of QScopedSharedPointer
| | | * | | | | | | | | | Add missing template typedefsHarald Fernengel2009-08-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago
| | | * | | | | | | | | | Fix Q_DECLARE_SHARED macroHarald Fernengel2009-08-201-1/+1
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, gcc was not picking up the qSwap specialization. Removing the explicit template call made it work. Reviewed-by: Thiago
| | * | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-2019-601/+801
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/painting/svgviewer/files/bubbles.svg src/corelib/kernel/qobject.cpp src/network/kernel/qhostinfo.cpp tests/auto/qhostinfo/tst_qhostinfo.cpp
| * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-2023-70/+180
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Clarified comment on ordinal use in QLibraryPrivate::loadPlugin()Miikka Heikkinen2009-08-201-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | | | | | | | Move the declarative ui destroyed handlingHarald Fernengel2009-08-201-2/+2
| | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, the qWarning will be bogus.
| | * | | | | | | | | Reverse the ifdefs to make it clearer, as per code review.axis2009-08-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | | | | | | Added some comments after code review.axis2009-08-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | | | | | | Cosmetic fix: Unify the Q_DISABLE_COPY macroHarald Fernengel2009-08-191-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q_DISABLE_COPY must make the copy constructor and assignment operator private in all cases, otherwise the compiler will create implicit versions when exception support is on.
| | * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-195-16/+114
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/auto.pro
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-192-13/+13
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Did some cleanups after review of the S60 branch.axis2009-08-192-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me It's all comments and build fixes.
| | * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-1914-14/+14
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Changed names and URLs to reflect name change.axis2009-08-1914-14/+14
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | | | | | | | renamed and restyled exit info printermread2009-08-191-10/+17
| | |/ / / / / / / / /
| * | | | | | | | | | performance: refactored use of RFs so corelib and gui share one sessionShane Kearns2009-08-205-71/+84
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opening and closing sessions has a performance impact on Symbian, so all users of RFs now share a single session. If a native file engine is written for Symbian (instead of the posix one currently in use) then that could own the global data instead of QCoreApplication. Task-number: 247617 Reviewed-by: jbarron
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-182-12/+21
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-185-20/+19
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixes to Symbian native engine for QFileSystemWatcher.Shane Kearns2009-08-182-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wrong version of cancel was used, resulting in all filesystem notifications being cancelled when one path was removed from the engine. For directory notifications, changed ENotifyAll to ENotifyEntry to reduce the spurious directory changed notifications which come from file modifications within that directory. On Symbian OS, opening a file for overwrite (truncate mode in Qt terms) will cause a directory change notification, the OS considers it to be the same type of event as creating a new file for the first time. Other platforms presumably do not have this behaviour otherwise the auto test would fail there as well. Reviewed-by: miikka heikkinen
| * | | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-18109-764/+8626
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| * | | | | | | | | | | rename QLockedMutexUnlocker to QMutexUnlockerHarald Fernengel2009-08-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * | | | | | | | | | | Changed to SymbianVersion enum after review.axis2009-08-172-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me AutoTest: It built...
| * | | | | | | | | | | remove a ### commentLars Knoll2009-08-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change is actually correct, as we only need the commented out codepath for debugging.
| * | | | | | | | | | | Fixed merge failure in qfsfileengine_unix.cpp.Miikka Heikkinen2009-08-141-3/+4
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Changing names of Symbian leave <-> qt throw translation functionsmread2009-08-133-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | due to http://qt-reviews.europe.nokia.com/r/67/
| * | | | | | | | | | Fix compilation of unix file engine.Jason Barron2009-08-131-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a bracket to the right place and re-arrange the code a little. The indenting was wrong here in the non-Symbian case since the if (exists) did not have curly bracket. Also copy the union of the Hidden flag into the Symbian #ifdef to make this code slightly more readable.
| * | | | | | | | | | Clean up platform defines a bitHarald Fernengel2009-08-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per Marius' S-O's request :)
| * | | | | | | | | | trivial: change commentHarald Fernengel2009-08-131-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix QVarLengthArray out of bounds readHarald Fernengel2009-08-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Ralf Engels
| * | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-131-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Worked around RVCT scoping issues by making scope explicit in places thatMiikka Heikkinen2009-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the compiler couldn't figure out when building qsharedpointer test.
| * | | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-13418-690/+864
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * | | | | | | | | | | Add comparison operators also to subclassesHarald Fernengel2009-08-101-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiler would for some reason choose operator bool() instead when comparing subclasses of QScopedPointer.
| * | | | | | | | | | | s/class/struct/Harald Fernengel2009-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop confusing MSVC by correctly forward declare QScopedPointerDeleter as struct
| * | | | | | | | | | | add operator! to QScopedPointerHarald Fernengel2009-08-102-0/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-1010-66/+154
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/master'Jason Barron2009-08-102-10/+8
| | |\ \ \ \ \ \ \ \ \ \ \
generated by cgit v0.12 at 2025-03-04 12:05:55 (GMT)