summaryrefslogtreecommitdiffstats
path: root/src/dbus
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * Allow QtDBus to be compiled as a static library on Windows.Thomas Sondergaard2010-05-041-1/+3
| | | | | | | | | | Merge-request: 569 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | QDBusXmlGenerator: get the true name from QMetaType for the return typeThiago Macieira2010-05-061-1/+1
| |
* | Add missing newline to static XML snippetThiago Macieira2010-05-061-1/+1
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-011-1/+1
|\ \ | |/
| * Fix crash in QDBusInterface when invoking a method in a derived class.Thiago Macieira2010-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If metaObject is 0 and the signal or slot is in a class deriving from QDBusInterface, this would lead to a crash. Deriving from QDBusInterface is very unusual and usually indicates misunderstanding of QtDBus, but the fix is correct. Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=165175 Patch-By: Maemo developer Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Introduce a qconfig feature for QtDBusTasuku Suzuki2010-04-0856-3/+199
| | | | | | | | | | | | | | | | | | | | QtDBus module is useless with QT_NO_PROPERTIES. Add D-Bus section and DBUS feature which requires PROPERTIES. Update qfeatures.h. Disable QtDBus module, a bearer management plugin for NetworkManager and a script plugin for QtDBus when QT_NO_DBUS is defined. Merge-request: 511 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Doc: Remove QDBusServer from the public documentation.Thiago Macieira2010-04-061-1/+1
| | | | | | | | Task-number: QTBUG-5066
* | Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-051-1/+2
| | | | | | | | | | | | | | This of course requires installing libdbus compiled for Windows CE too. Task-number: QTBUG-9582 Patch-by: Romain Pokrzywka (from KDAB)
* | Compile Qt in C++0x mode.Thiago Macieira2010-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This is not valid in C++0x: char str[] = { 128, 0 }; Because 128 cannot be represented in a char. The same applies to conversion from int to qreal: it's a narrowing conversion, with possible data loss. More info: http://www2.research.att.com/~bs/C++0xFAQ.html#narrowing Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-3/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Doc: document what the timeout of -1 means in D-BusThiago Macieira2010-03-041-3/+14
| | | | | | | | Task-number: QTBUG-8729
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-184-1/+50
|\ \ | |/ |/| | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
| * doc: Fixed some qdoc errors.Martin Smith2010-02-161-4/+3
| |
| * update according to Thiago's comments.Holger Schroeder2010-02-123-13/+28
| | | | | | | | | | Merge-request: 2307 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Changes: add functionality for dbus auto start to qtHolger Schroeder2010-02-124-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: TrustMe Details: This is the first part of an implementation that introduces handling of the dbus autoStart flag into qt. This flag determines in the used dbus implementation, if the receiver of a method call will be started if it is not running yet, or if it will not be started. The part from dbus up to QDBusMessage should be fine, but i do not know how to set this flag from the higher layers. Ideally this would be generated from qdbusxml2cpp. Merge-request: 2307 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Fix an issue with the error signal in a callWithCallback not beingThiago Macieira2010-02-161-18/+9
|/ | | | | | | | | | delivered queued. Since we emit the signal while the locks are in place, we have to have queued delivery. Task-number: QT-760 Reviewed-by: Trust Me