| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: TrustMe
|
| |
|
|
|
|
|
|
|
|
| |
This amend previous commit by removing the duplicate function.
The quote need to be escaped in attributes.
Reviewed-by: Thomas Zander
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
At least in D-Bus 1.2.16, there's a deadlock caused by locking an
already-locked mutex. When Qt is linked to libdbus-1 instead of
dynamically loading it, it maintains legacy compatibility by only
providing the non-recursive mutexes, which triggers this deadlock.
The recursive functions have been present since 0.93, so I guess the
non-recursive variants aren't tested.
Report: https://bugzilla.novell.com/show_bug.cgi?id=482749#c30
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/global/qglobal.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/qabstractitemview/tst_qabstractitemview.cpp
tests/auto/qcssparser/qcssparser.pro
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| | |
Refers to change 5170432e7cb2d0d1adf7ac2ec1ece627c75470f3 where
QDataStream was altered to stream all floating point numbers with the
same precision.
Reviewed-by: Samuel
|
|\ \
| |/
| |
| |
| | |
Conflicts:
translations/qtconfig_ru.ts
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/platform-notes.qdoc
src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
|
| |
| |
| |
| | |
Reviewed-by: trustme
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Reviewed-by: Joao
Conflicts:
src/gui/graphicsview/qgraphicsview.cpp
src/gui/widgets/qspinbox.cpp
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Trust me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
This is a maintenance headache. Just reference the canonical supported
platforms list instead.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some applications that uses a mix of OpenGL and QPainter code may
not work correctly with the new GL 2 engine (e.g. the composition demo).
The same is most likely also true for user apps, therefore we need
a way to enforce the usage of the old GL 1 engine for the sake of
compatibility.
Task-number: 260872
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| | |
Including the befaviour change
Reviewed-by: Thierry
|
| |
| |
| |
| |
| |
| |
| |
| | |
Previously we were using QPaintEngine::syncState() which is not ideal
naming-wise, since it actually prepares for native painting instead of
syncing the painter's state to native state.
Reviewed-by: Trond
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Reviewed-by:TrustMe
|
| | |
| | |
| | |
| | | |
RevBy: Trust me
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
config.tests/unix/openssl/openssl.pri
demos/embedded/embedded.pro
examples/itemviews/chart/chart.pro
examples/network/network.pro
examples/painting/painterpaths/painterpaths.pro
examples/threads/mandelbrot/mandelbrot.pro
qmake/project.cpp
src/3rdparty/libtiff/libtiff/tif_config.h
src/corelib/arch/arch.pri
src/corelib/global/qglobal.cpp
src/corelib/kernel/kernel.pri
src/corelib/kernel/qcore_unix_p.h
src/corelib/kernel/qobject.cpp
src/corelib/thread/qthread_unix.cpp
src/corelib/tools/qsharedpointer_impl.h
src/corelib/tools/tools.pri
src/gui/kernel/qaction.h
src/gui/kernel/qapplication.cpp
src/gui/painting/qregion.h
src/gui/widgets/qlineedit.cpp
src/gui/widgets/qlineedit_p.h
src/network/socket/qnativesocketengine_unix.cpp
tests/auto/qdir/tst_qdir.cpp
tests/auto/qdiriterator/tst_qdiriterator.cpp
tests/auto/qhttp/qhttp.pro
tests/auto/qline/qline.pro
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qresourceengine/qresourceengine.pro
tests/auto/qsharedpointer/qsharedpointer.pro
tests/auto/qstring/qstring.pro
tests/auto/qtcpsocket/qtcpsocket.pro
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Squashed commit of the following:
commit fcf7e8cab339d0cf9f3f2a9756d7754c54c4d934
Author: Gunnar Sletta <gunnar@trolltech.com>
Date: Thu Jul 30 13:15:13 2009 +0200
note in the changes file...
commit 2c9c3880215988e6609c290a8e738b228736e601
Author: Gunnar Sletta <gunnar@trolltech.com>
Date: Thu Jul 30 12:51:42 2009 +0200
Don't leak native window HRGN handles
commit 6bb30d2075dd1d71a8a600d25f413a38af7f2f2c
Author: Gunnar Sletta <gunnar@trolltech.com>
Date: Thu Jul 30 11:09:22 2009 +0200
Moved qregion_wince.cpp -> qregion_win.cpp, platforms are identical now
commit 173fcc5baec73a198167985c6f777987e6015a71
Author: Gunnar Sletta <gunnar@trolltech.com>
Date: Thu Jul 30 09:42:06 2009 +0200
win32 calls on QRegion.handle() is no longer supported, use from HRGN
commit d7ddcce4ba29b70ed81f85274208b388a2bb9d4d
Author: Gunnar Sletta <gunnar@trolltech.com>
Date: Thu Jul 30 09:41:37 2009 +0200
Added convenience function to convert from HRGN to QRegion
commit 2fc53ac3d59a9c42bb4154fff7557610092b7946
Author: Gunnar Sletta <gunnar@trolltech.com>
Date: Wed Jul 29 09:28:10 2009 +0200
Kill qregion_win.cpp and use the unix code instead
|
| | |
| | |
| | |
| | | |
Referring to change f120b5e4b63cbc30874fa21947b75d352f18d7df.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
qmake/Makefile.unix
qmake/generators/makefile.cpp
src/corelib/global/qglobal.h
src/corelib/kernel/kernel.pri
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qaction.cpp
src/gui/kernel/qaction.h
src/gui/kernel/qaction_p.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget.h
src/gui/kernel/qwidget_mac.mm
src/gui/painting/qgraphicssystemfactory.cpp
src/gui/styles/qwindowsstyle.cpp
src/gui/text/qfontengine_qpf.cpp
src/gui/widgets/qabstractscrollarea_p.h
src/network/access/qnetworkaccessdebugpipebackend.cpp
src/network/socket/qlocalsocket_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
src/openvg/qpaintengine_vg.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qcssparser/qcssparser.pro
tests/auto/qdir/tst_qdir.cpp
tests/auto/qfile/tst_qfile.cpp
tests/auto/qobject/tst_qobject.cpp
tests/auto/qpathclipper/qpathclipper.pro
tests/auto/qprocess/tst_qprocess.cpp
tests/auto/qsettings/tst_qsettings.cpp
tests/auto/qsharedpointer/qsharedpointer.pro
tests/auto/qsqlquerymodel/qsqlquerymodel.pro
tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
tests/auto/qsqltablemodel/qsqltablemodel.pro
tests/auto/qsqlthread/qsqlthread.pro
tests/auto/qwidget/tst_qwidget.cpp
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
With the exception of cfadf08a, all the commits from adc1c08e to
a6e32ae1 were from Milan, even if the Author were on some of the
commits mangled into my name. This was my mistake, when splitting
and reorganizing his massive contribution. My appologies Milan.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
and add manual testcase.
Provide replacement "screenCount" for numScreens and document numScreens
as obsolete to be more consistent with other APIs.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.gitignore
configure.exe
src/corelib/concurrent/qtconcurrentthreadengine.h
src/corelib/global/qnamespace.h
src/gui/graphicsview/qgraphicssceneevent.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_p.h
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qwidget.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkaccesshttpbackend.cpp
tests/auto/network-settings.h
tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
tests/auto/qvariant/tst_qvariant.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Requested by Girish and Jurgen. Useful for training and small examples.
Task-number: 245219
Reviewed-by: Tobias Koenig
AutoTest: Included in this submit.
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/network/access/qnetworkreplyimpl.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Merged webkit with -s ours as all the changes have been imported
previously from the trunk.
Conflicts:
src/3rdparty/webkit/JavaScriptCore/ChangeLog
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.cpp
src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowBase.cpp
src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowCustom.cpp
src/3rdparty/webkit/WebCore/bindings/js/JSImageConstructor.cpp
src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelConstructor.cpp
src/3rdparty/webkit/WebCore/bindings/js/JSXMLHttpRequestConstructor.cpp
src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp
src/3rdparty/webkit/WebCore/css/CSSParser.cpp
src/3rdparty/webkit/WebCore/dom/Document.cpp
src/3rdparty/webkit/WebCore/generated/JSAttr.cpp
src/3rdparty/webkit/WebCore/generated/JSCharacterData.cpp
src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h
src/3rdparty/webkit/WebCore/generated/JSDocument.cpp
src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.cpp
src/3rdparty/webkit/WebCore/generated/JSElement.cpp
src/3rdparty/webkit/WebCore/generated/JSEventTargetNode.cpp
src/3rdparty/webkit/WebCore/generated/JSEventTargetNode.h
src/3rdparty/webkit/WebCore/generated/JSXSLTProcessor.cpp
src/3rdparty/webkit/WebCore/generated/JSXSLTProcessor.h
src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp
src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp
src/3rdparty/webkit/WebCore/html/HTMLParser.cpp
src/3rdparty/webkit/WebCore/html/HTMLParser.h
src/3rdparty/webkit/WebCore/html/HTMLSelectElement.cpp
src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp
src/3rdparty/webkit/WebCore/page/DOMWindow.idl
src/3rdparty/webkit/WebCore/page/DragController.cpp
|