summaryrefslogtreecommitdiffstats
path: root/src/dbus
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-233-40/+55
|\ | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * QtDBus: Make sure we can receive unknown typesThiago Macieira2011-02-171-1/+6
| | | | | | | | | | | | | | We must make sure we advance the receiving iterator, or we end up in an infinite loop. Task-number: QTBUG-17476
| * QtDBus meta object: keep methods, signals and props with unknown typesThiago Macieira2011-02-172-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Make the QtDBus parser not complain about unknown thingsThiago Macieira2011-02-172-30/+36
| | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-102-25/+31
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * QtDBus: do not wait for reply for AddMatch and RemoveMatchThiago Macieira2011-02-061-24/+14
| | | | | | | | | | | | | | | | 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>
| * Make qdbus show all types, even those that it doesn't know aboutThiago Macieira2011-02-061-1/+17
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-032-0/+16
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QtDBus: add support for QVariantHash out of the box
| * | QtDBus: add support for QVariantHash out of the boxThiago Macieira2011-02-032-0/+16
| | |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-011-2/+3
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: mkspecs/features/symbian/application_icon.prf src/sql/drivers/odbc/qsql_odbc.cpp
| * Change the D-Bus signal filter to return NOT_YET_HANDLED for signalsThiago Macieira2011-01-261-2/+3
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-2/+18
|\ \ | |/ | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * Validate arguments to QDBusConnection::connectThiago Macieira2011-01-211-2/+18
| | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1760-63/+61
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update copyright year to 2011.Jason McDonald2011-01-1060-60/+60
| | | | | | | | Reviewed-by: Trust Me
| * Do not crash in case a future version of libdbus has a new kind of message.Thiago Macieira2010-12-221-3/+1
| |
* | qt project files: create pkg-config files for mingwMark Brand2011-01-101-1/+1
| | | | | | | | | | | | | | This is mostly the same as for unix. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-062-9/+39
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * Fix a race condition related to service acquisition.Thiago Macieira2010-11-262-9/+39
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-3/+3
|\ \ | |/ | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * Doc: Clarified the lifetime of the session bus connection.David Boddie2010-11-031-3/+3
| | | | | | | | Reviewed-by: Thiago Macieira
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-258-11/+11
|\ \ | |/
| * Fixed many spelling errors.Rohan McGovern2010-10-258-11/+11
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-282-34/+45
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * We also don't need to watch for org.freedesktop.DBus changing ownersThiago Macieira2010-09-221-0/+4
| | | | | | | | | | | | | | | | It never does. Task-number: QT-3881 Reviewed-By: Robin Burchell Reviewed-By: Ritt Konstantin
| * Avoid adding match rules for NameAcquired and NameLostThiago Macieira2010-09-221-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * We don't need to add a match rule to receive messages targetted at us.Thiago Macieira2010-09-221-18/+0
| | | | | | | | | | | | | | | | | | 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
| * Save the D-Bus's base service earlier.Thiago Macieira2010-09-221-2/+4
| | | | | | | | | | | | | | | | 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
| * Pre-populate the watched services hash with org.freedesktop.DBusThiago Macieira2010-09-222-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Quick performance optimisation: cache a QString with "org.freedesktop.DBus"Thiago Macieira2010-09-221-9/+17
| | | | | | | | | | Reviewed-By: Robin Burchell Reviewed-By: Ritt Konstantin
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix remote crash in delivering D-Bus calls with too few argumentsThiago Macieira2010-09-021-0/+3
| | | | | | | | | | | | Patch by Christoph Feck. Task-number: QTBUG-13348 Reviewed by me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-133-9/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-111-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| | * doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-101-2/+2
| | |
| * | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-091-9/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * doc: Fixed some qdoc errors.Martin Smith2010-08-061-2/+3
| | |
| | * Move note on connectToBus() not actually being able to reconnect toRobin Burchell2010-08-051-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Doc: Fixed qdoc warnings.David Boddie2010-08-051-0/+4
| |/ | | | | | | Reviewed-by: Trust Me
| * Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-292-2/+2
| | | | | | | | QTBUG-11938 and QTBUG-10801
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-064-15/+15
|/ | | | | | | | | | | | | | | 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
* fixed QDBUS export errorEvan Nguyen2010-07-261-1/+1
|
* Q_INVOKABLES added to Qt-DBusEvan Nguyen2010-07-264-12/+23
| | | | Task-number: QTBUG-12397
* fix the export macros for the QtDBus moduleRomain Pokrzywka2010-07-2125-70/+62
| | | | | Merge-request: 2439 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-253-10/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| * Remove unused function in QDBusConnectionPrivateThiago Macieira2010-05-252-9/+0
| |
| * QDBusAbstractInterface: don't set lastError outside the object's own threadThiago Macieira2010-05-231-1/+4
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-254-35/+84
|\ \ | |/ |/| | | | | | | | | | | Conflicts: demos/spectrum/app/app.pro src/gui/egl/qegl.cpp tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro tests/auto/qmenu/tst_qmenu.cpp
| * Fix a race condition with QtDBus blocking for replies.Thiago Macieira2010-05-244-34/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an auxiliary thread tried to block on waiting for a reply, and at the same time the main thread handled the reply, there's room for a race condition. So ensure only one thread is stopped at dbus_pending_call_block(). The other thread(s) will be waiting on the QWaitCondition. It's not a race condition for the main thread to process (and finish processing) the reply while the auxiliary thread hasn't even started to wait. The code will ensure that the reply is properly seen. Task-Id: https://projects.maemo.org/bugzilla/show_bug.cgi?id=155306 Reviewed-By: Trust Me
| * QtDBus: Debug message updateThiago Macieira2010-05-241-1/+1
| |
generated by cgit v0.12 at 2024-11-15 01:55:57 (GMT)