summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-3174-962/+962
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-31369-4797/+4797
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-31356-4628/+4628
| | | | | | | | Reviewed-by: Trust Me
| * Eliminate some mentions of Trolltech.Jason McDonald2009-08-113-3/+3
| | | | | | | | Reviewed-by: Trust Me
| * Qt's domain name is now qt.nokia.com.Jason McDonald2009-08-112-5/+5
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-11356-356/+356
| | | | | | | | Reviewed-by: Trust Me
| * xlC 7 cannot compile QtConcurrent with these templates hereThiago Macieira2009-08-071-1/+1
| | | | | | | | (cherry picked from commit cb64ac587249f5dc6563a035e2ef5a3ad2bc5d13)
* | Add an opt-in QWeakPointer::operator->.Thiago Macieira2009-08-311-0/+4
| | | | | | | | | | | | | | To use this, you must add #define QWEAKPOINTER_ENABLE_ARROW to your .cpp before #including any headers. Be careful about adding this to .h files. Reviewed-by: Olivier Goffart
* | trivial: make moc compile againHarald Fernengel2009-08-281-0/+2
| |
* | QMetaObjectPrivate: refactor internal disconnect to avoid duplicate codeLeonardo Sobral Cunha2009-08-282-49/+47
| | | | | | | | Reviewed-by: ogoffart
* | Mark the QSharedPointer with Qt::Uninitialized explicitThiago Macieira2009-08-281-1/+1
| | | | | | | | | | | | | | That ensures we don't create ambiguities. QSharedPointer shouldn't have any implicit constructors. Suggested-By: Olivier Goffart
* | Enable Q_OBJECT usage across DLL boundary on Symbian OSShane Kearns2009-08-283-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian loader does not allow DLL import relocations in the data section. To workaround this, added an accessor function which can be used to get the class static metadata from the base class even if it is in another DLL. Changing the implementation for all platforms would cause a binary break, so it is only used for Symbian. The Q_NO_DATA_RELOCATION macro is used to configure this feature instead of Q_OS_SYMBIAN, because it is possible another platform may need the same fix and Symbian may eventually fix their DLL loader to support this feature. Task-number: 258893 Reviewed-by: Kent Hansen
* | doc: Fixed several qdoc errors.Martin Smith2009-08-281-2/+2
| |
* | Whitespaces & indentation cleanup in qobjectLeonardo Sobral Cunha2009-08-282-26/+27
| | | | | | | | Reviewed-by: trustme
* | doc: Fixed several qdoc errors.Martin Smith2009-08-281-31/+45
| |
* | doc: Fixed several qdoc errors.Martin Smith2009-08-281-9/+9
| |
* | doc: Fixed several qdoc errors.Martin Smith2009-08-284-17/+15
| |
* | doc: Fixed several qdoc errors.Martin Smith2009-08-282-9/+12
| |
* | Q_ASSERT failure in QStateMachinePrivate::handleTransitionSignal.Gabriel de Dietrich2009-08-285-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The signal index actually emitted was different from the signal index registered. This was due to recent changes in the meta-object protocol, where new indexes are being created (cloned) for signals with default parameters. When registering the transition signal, we now look for the original (non cloned) signal index. The transition keeps track of the user-specified signal index, and sets it when calling onTransition. Reviewed-by: Kent Hansen Reviewed-by: Olivier Goffart Task-number: 260403
* | Documentation of QAbstractProxyModel::resetOlivier Goffart2009-08-281-3/+2
| | | | | | | | | | | | Rectification after the last merge request integration Reviewed-by: Thierry
* | Fix the API for resetting QAbstractItemModels.Stephen Kelly2009-08-282-7/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit deprecates the QAIM::reset() method, and adds beginResetModel() and endResetModel() methods, addressing Qt issue 247023. http://www.qtsoftware.com/developer/task-tracker/index_html?method=entry&id=247023 If models and proxies use QAIM::reset() alone, then proxies will emit modelAboutToBeReset after its source model is reset. This means that mapToSource will not behave as expected (Will always return an invalid index) in a slot connected to modelAboutToBeReset. The usecase for this is maintaining viewstate (which items are selected, expanded) when the model is reset. See BrowserWidget::modelChanged here: http://websvn.kde.org/trunk/KDE/kdepim/akonadi/akonadiconsole/browserwidget.cpp?view=markup Task-number: 247023 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Merge-request: 1072
* | QAbstractAnimation: replacing QPointer usage for QWeakPointerLeonardo Sobral Cunha2009-08-281-12/+19
| | | | | | | | | | | | Added guard checks after the virtual method calls. Reviewed-by: thierry
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-273-9/+25
|\ \
| * | QAbstractAnimation: fixes segfault when deleting animation inside ↵Leonardo Sobral Cunha2009-08-272-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updateCurrentTime That deletion removed the respective animation from the list of running animations being processed, but not from the copy of the list introduced in 48489988521b818bda8d76e60cb272508e91b490, thus we had a dangling pointer. Reviewed-by: thierry
| * | work around a compiler bug (gcc <= 4.0.x) that renders the drop-in versionhjk2009-08-271-0/+6
| | | | | | | | | | | | | | | | | | of QStringBuilder incompilable Reviewed-by: Roberto Raggi
* | | Doc: Added suggestion about decoding arguments from argv. Tidying up.David Boddie2009-08-271-26/+44
|/ / | | | | | | | | Task-number: 218125 Reviewed-by: Trust Me
* | QPropertyAnimation: small refactor and we got rid of QMetaPropertyThierry Bastian2009-08-272-30/+14
| | | | | | | | | | | | We don't need QMetaProperty becaus we always try to directly use the qt_metacall. This allowed for a 24 bytes reduction of the private class.
* | QPropertyAnimation: use of QWeakPointer instead of QObject::connectThierry Bastian2009-08-273-33/+23
| |
* | Animation: reordering of private members saves 8 bytesThierry Bastian2009-08-271-3/+3
| | | | | | | | | | | | ...on the private object Reviewed-by: Trust Me
* | Doc: Small change to QProcess::waitForFinished()Geir Vattekar2009-08-271-1/+2
| | | | | | | | | | Task-number: 258404 Reviewed-by: Trust Me
* | Merge branch 'mergeRequest' into 4.6axis2009-08-272-74/+59
|\ \
| * | move QFSFileEngine-related symbian code from qtemporaryfile to qfsfileengineRitt Konstantin2009-08-272-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | i'm a garbage collector :) AutoTest: Passed RevBy: Miikka Heikkinen Signed-off-by: axis <qt-info@nokia.com>
| * | remove symbianFileName stub once and for allRitt Konstantin2009-08-271-19/+17
| | | | | | | | | | | | | | | | | | | | | simply use ifdef to point which implementation should be compiled AutoTest: Passed Signed-off-by: axis <qt-info@nokia.com>
| * | fixes and improvements made after s60 branch has been merged into masterRitt Konstantin2009-08-271-51/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crash fixed ( d->filePath.at(0).isLetter() ) * warning removed in QFSFileEngine::copy ( unused param ) * minor optimisations * styling fixes * needless header include removed ( qregexp.h ) AutoTest: Passed Signed-off-by: axis <qt-info@nokia.com>
* | | Missing ducumentation in QAbstractItemModelOlivier Goffart2009-08-261-0/+34
| | |
* | | reverting the definition of WINVER and _WIN32_WINNT in qglobal.hJoerg Bornemann2009-08-263-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just caused too much problems and must be solved another way. In qfsfileengine_win.cpp we define FSCTL_GET_REPARSE_POINT and all of the other stuff that's needed for NTFS symlink support, if its not defined. This is the case if _WIN32_WINNT is less than 0x0500. All other changes in this commit are just reversions of commits that were done for the infamous qglobal.h change. Discussed with prasanth, tested by pulse.
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-263-0/+347
|\ \ \
| * | | Add move API to QAbstractItemModel.Stephen Kelly2009-08-263-0/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the function beginMoveRows, endMoveRows, beginMoveColumns, endMoveColumns Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Acknowledged-by: Thierry Merge-request: 972
* | | | Doc: Corrected incorrect snippets and info in inherits() documentation.David Boddie2009-08-261-4/+3
|/ / / | | | | | | | | | | | | Task-number: 201882 Reviewed-by: Trust Me
* | | Revert "qglobal.h now has the definition for WINVER"Thierry Bastian2009-08-261-0/+7
| | | | | | | | | | | | | | | This reverts commit f7ebdd380d16a7be9713930b5ab41c32e996dcdb. defining WINVER in qglobal.h is about to be reverted.
* | | Doc: Noted a limitation in using slashes in settings section names.David Boddie2009-08-261-3/+3
|/ / | | | | | | | | Task-number: 254511 Reviewed-by: Trust Me
* | Fixed compilation on gcc 3.3 and mutex locker lifetimeThorbjørn Lindeijer2009-08-261-1/+1
| | | | | | | | | | | | | | This fixes the lifetime of the mutex locker, since before it would already be destroyed on the next line. Reviewed-by: Olivier Goffart <olivier.goffart@trolltech.com>
* | fix warnings on Windows CEJoerg Bornemann2009-08-261-0/+2
| | | | | | | | | | | | | | Lots of warnings in the qreal == float case. Some Q_UNUSED added. Reviewed-by: thartman
* | animations: make sure setCurrentTime is called on all animationsThierry Bastian2009-08-251-2/+5
| | | | | | | | | | | | | | | | The problem was we were iterating over the list of running animations. And when calling setCurrentTime(<duration>) on one of them they just unregister themselves from the timer and we would miss some of them. Reviewed-by: leo
* | Removed redundant QLocale code from QCoeFepInputContext.axis2009-08-252-3/+6
| | | | | | | | | | | | We export one extra private symbol from QtCore instead, and use that. RevBy: Miikka Heikkinen
* | Merge commit 'origin/master' into 4.6Jason Barron2009-08-2514-308/+332
|\ \
| * \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-246-35/+39
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfilesystemwatcher_symbian.cpp
| | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-2431-310/+839
| | |\ \
| | * | | Make the singleton file server session independent of QCoreApplicationShane Kearns2009-08-246-35/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After review comments, changed the file server session from a member of QCoreApplication to a Q_GLOBAL_STATIC, because some applications will want to access files before constructing the QApplication. Reviewed-By: Janne Anttila
| * | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-2424-239/+791
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_unix.cpp