| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
And also in QMetaMethod::invoke
Reviewed-by: brad
|
|
|
|
|
|
|
|
|
|
|
|
| |
The marshaller and demarshaller need to know the features negotiated
with the peer so as to determine what's permitted. This is especially
important to the marshaller: the libdbus-1 API may "throw a fit" if we
try to pass a type that isn't allowed or the server may disconnect us.
The use of the capabilities in the demarshaller are for symmetry and
for us to toggle the feature in unit tests.
Task-number: QTBUG-17478
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The capabilities are negotiated with the D-Bus peer or bus at
connection time and may include extra features not available when
D-Bus 1.0 was released.
Currently (as of D-Bus 1.4), the only additional feature is Unix file
descriptor passing.
Proposed features are "maybe types" and single-precision floating
point. They may be added to D-Bus 1.6.
Task-number: QTBUG-17478
|
|
|
|
|
|
| |
Some applications experience weird behaviour that sometimes it works and
sometimes it doesn't, due to D-Bus being first used in a thread. So
instead do everything in the main thread for the two main connections.
|
|
|
|
|
|
|
|
|
|
| |
This is internal API and the behaviour may change without notice. In
the future, I could use a different implementation without libdbus-1,
so this pointer may be something different. The use of DBusConnection
is also entirely implementation-defined, so keeping this connection
around is entirely unsupported.
You have been warned.
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoaview_mac.mm
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
src/testlib/qtestcase.cpp
|
| |
| |
| |
| |
| |
| |
| | |
We must make sure we advance the receiving iterator, or we end up in
an infinite loop.
Task-number: QTBUG-17476
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Use VoidStar as the metatype, with an unknown type called
"QDBusRawType". The actual D-Bus type is saved as an hex value as a
template parameter.
D-Bus type Qt type comment
h QDBusRawType<0x68>* Unix file descriptors
~ QDBusRawType<0x7e>* invalid type
ai QDBusRawType<0x6169>* array of int32
a{i(ssy)} QDBusRawType<0x617b6928737379297d>*
Note that the number in the template doesn't have to be valid. The
QDBusRawType class doesn't exist anyway.
I thought of just leaving the raw D-Bus type there, but who knows what
kind of things can appear there, like other '>' (which may cause
problems for anything trying to parse the meta object later).
Task-number: QTBUG-17476
|
| |
| |
| |
| |
| |
| |
| | |
Keep only the warnings about application errors. If the unknown things
come from the outside, it's not our job to make noise.
Task-number: QTBUG-17476
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/development/qmake-manual.qdoc
mkspecs/symbian-gcce/qmake.conf
qmake/project.cpp
src/corelib/global/qnamespace.qdoc
src/declarative/graphicsitems/qdeclarativetext.cpp
src/gui/text/qtextdocumentlayout.cpp
src/gui/text/qtextdocumentlayout_p.h
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/networkselftest/networkselftest.pro
tests/auto/qscriptengine/tst_qscriptengine.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
| |
| |
| |
| |
| |
| |
| |
| | |
We can't recover from these functions failing anyway, so don't ask for
an error condition. The D-Bus library will set the no-reply flag under
these conditions.
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QtDBus: add support for QVariantHash out of the box
|
| | | |
|
|\ \ \
| |/ /
|/| /
| |/
| |
| | |
Conflicts:
mkspecs/features/symbian/application_icon.prf
src/sql/drivers/odbc/qsql_odbc.cpp
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
configure
src/network/bearer/bearer.pri
|
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes a crash caused by user code trying to connect to object
paths that aren't valid (if we send this to the bus daemon, we get an
error with the AddMatch call).
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
This is mostly the same as for unix.
Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/image/qpnghandler.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/opengl/qgl_x11egl.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The explanation is in the testcase and in the task.
The reentrancy caused some deadlocks, that's why handleMessage() stops
processing if the refcount has dropped down to zero. Should also save
some CPU cycles at the application shutdown time.
Task-number: QTBUG-15651
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
mkspecs/features/symbian/symbian_building.prf
src/network/access/qhttpnetworkconnectionchannel.cpp
|
| |
| |
| |
| | |
Reviewed-by: Thiago Macieira
|
|\ \
| |/ |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/painting/qrasterizer.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/mainwindow.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
It never does.
Task-number: QT-3881
Reviewed-By: Robin Burchell
Reviewed-By: Ritt Konstantin
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
These two signals from org.freedesktop.DBus are delivered no matter
what, because they are directed signals. So we don't need to add match
rules for it.
QDBusConnectionPrivate::connectSignal builds a match rule and adds it,
so we shouldn't use it.
Task-number: QT-3881
Reviewed-By: Robin Burchell
Reviewed-By: Ritt Konstantin
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This wasn't explicit in the D-Bus specification until recently. The
reference implementation of the daemon already does it.
Task-number: QT-3881
Reviewed-By: Robin Burchell
Reviewed-By: Ritt Konstantin
|
| |
| |
| |
| |
| |
| |
| |
| | |
It's impossible for it not to be present, so there's no need to test
for it.
Reviewed-By: Robin Burchell
Reviewed-By: Ritt Konstantin
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The D-Bus specification doesn't require
GetNameOwner("org.freedesktop.DBus") to return anything in specific,
but the reference implementation always returns
"org.freedesktop.DBus". The Python D-Bus bindings even require it.
So add the same assumption to QtDBus, which saves a round-trip at the
application start to ask the server what its own owner is
Reviewed-By: Robin Burchell
Reviewed-By: Ritt Konstantin
|
| |
| |
| |
| |
| | |
Reviewed-By: Robin Burchell
Reviewed-By: Ritt Konstantin
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
demos/declarative/snake/content/snake.js
demos/declarative/snake/snake.qml
doc/src/development/qmake-manual.qdoc
src/corelib/plugin/plugin.pri
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qdesktopwidget_win.cpp
src/gui/painting/qdrawhelper.cpp
tests/auto/qdir/tst_qdir.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
|
| |
| |
| |
| |
| |
| | |
Patch by Christoph Feck.
Task-number: QTBUG-13348
Reviewed by me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/painting/qpainter.cpp
src/gui/text/qtextengine.cpp
tests/auto/qimage/tst_qimage.cpp
tests/auto/qpainter/tst_qpainter.cpp
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-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
|
| | | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
connectToBus() documentation, where it belongs.
This also fixes some bad English ("make be connected") by means of removing it.
Merge-request: 2443
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
QTBUG-11938 and QTBUG-10801
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Test directory untouched.
This just apply those regexp:
git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue
git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue
git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue
git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert
git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert
git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue
git checkout src/corelib/kernal/qvariant*
Rev-by: dev mailing list
|
| |
|
|
|
|
| |
Task-number: QTBUG-12397
|
|
|
|
|
| |
Merge-request: 2439
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits)
Dont crash when assigning the same input context twice.
Fixed a typo in variable name in qlocale data generator.
Fix for Norwegian and Korean languages on symbian.
Remove unused function in QDBusConnectionPrivate
Doc: Fixing bugs in HTML generator
Updating 4.7.0 change log.
Doc: Correcting style to class lists
qdoc: Improved class index page.
Added MSVC 2010 project files to .gitignore
Fix architecture detection on GNU/Hurd.
Revert "tst_bic: make it possible to test for cross-compilation"
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
...
|