| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
(cherry picked from commit cb64ac587249f5dc6563a035e2ef5a3ad2bc5d13)
|
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| | |
That ensures we don't create ambiguities. QSharedPointer shouldn't have
any implicit constructors.
Suggested-By: Olivier Goffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: trustme
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
Rectification after the last merge request integration
Reviewed-by: Thierry
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
Added guard checks after the virtual method calls.
Reviewed-by: thierry
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | | |
of QStringBuilder incompilable
Reviewed-by: Roberto Raggi
|
|/ /
| |
| |
| |
| | |
Task-number: 218125
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| |
| |
| |
| |
| |
| | |
...on the private object
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: 258404
Reviewed-by: Trust Me
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
i'm a garbage collector :)
AutoTest: Passed
RevBy: Miikka Heikkinen
Signed-off-by: axis <qt-info@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
simply use ifdef to point which implementation should be compiled
AutoTest: Passed
Signed-off-by: axis <qt-info@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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>
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This adds the function beginMoveRows, endMoveRows, beginMoveColumns,
endMoveColumns
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
Acknowledged-by: Thierry
Merge-request: 972
|
|/ / /
| | |
| | |
| | |
| | | |
Task-number: 201882
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | | |
This reverts commit f7ebdd380d16a7be9713930b5ab41c32e996dcdb.
defining WINVER in qglobal.h is about to be reverted.
|
|/ /
| |
| |
| |
| | |
Task-number: 254511
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Lots of warnings in the qreal == float case.
Some Q_UNUSED added.
Reviewed-by: thartman
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
We export one extra private symbol from QtCore instead, and use that.
RevBy: Miikka Heikkinen
|
|\ \ |
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
Conflicts:
src/corelib/io/qfsfileengine_unix.cpp
|