summaryrefslogtreecommitdiffstats
path: root/src/dbus
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* When checking to see if a signal is connected, compare the match-arguments tooThiago Macieira2010-01-261-2/+4
|
* Do the refcounting of services watched properly.Thiago Macieira2010-01-261-20/+15
| | | | Issue found while debugging KDE applications.
* fix copy-paste errorRitt Konstantin2010-01-221-1/+0
| | | | | Merge-request: 442 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* minor optimizationRitt Konstantin2010-01-221-2/+3
| | | | | | | avoid needless atomic operations Merge-request: 442 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* Fix D-Bus calls with QDBus::BlockWithGui.Thiago Macieira2010-01-121-1/+1
| | | | | | | | We must wait for a reply in case the reply hasn't been received yet, not if it has already been received. Simple typo. Task-number: QT-2307 Reviewed-by: Trust Me
* Update copyright year to 2010Jason McDonald2010-01-0660-60/+60
| | | | Reviewed-by: Trust Me
* Remove the need to know the service owner when adding/removing signal rules.Thiago Macieira2010-01-024-34/+21
| | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe
* Use the watched service name list in matching incoming signals too.Thiago Macieira2010-01-021-2/+8
| | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe
* Change the QtDBus watched service list to a map to its owner.Thiago Macieira2010-01-022-17/+48
| | | | | | | | | | | | | Instead of simply counting how many times we're watching a service, also map a service to its owner. This allows us to provide a faster, cached GetNameOwner too. Technically, this could mean that a service that is started in-between event loops could remain invalid for a longer period of time. I'm not sure this is an issue -- will need some testing in KDE. Task-number: QTBUG-5979 Reviewed-By: TrustMe
* Update debug output to show the connection's ptr and threadThiago Macieira2010-01-021-10/+10
|
* Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-271-1/+3
|\
| * Fix D-Bus marshalling of booleans in optimised code.Thiago Macieira2009-12-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | C++ booleans are 1 byte in size, but D-Bus booleans (dbus_bool_t) are 4 bytes. That means a boolean with a zero in the LSB byte but non-zero garbage in the high bytes is a valid "false" in C++, but libdbus-1 will turn that to true when sending. Task-number: QTBUG-7041 Reviewed-By: Trust Me BT: yes
* | Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-152-1/+2
|\ \ | |/ | | | | | | Conflicts: mkspecs/macx-g++40/qplatformdefs.h
| * Fix crash in QDBusPendingReply/QDBusReply in case of unconnected calls.Thiago Macieira2009-12-092-1/+2
| | | | | | | | | | | | | | | | If we made calls on a QDBusConnection that isn't connected, the d pointer is 0. Ensure we don't crash. Task-number: QTBUG-6571 Reviewed-by: Bradley T. Hughes
| * Update license headers again.Jason McDonald2009-09-0859-236/+236
| | | | | | | | Reviewed-by: Trust Me
* | Fix compilation: private headers must be #included with ""Thiago Macieira2009-12-1012-13/+13
| | | | | | | | | | | | | | | | | | The reason is that the private headers don't exist in any of the -I lines, so they need to be found by the preprocessor relative to the source file, which means "". Task-number: QTBUG-6665 Reviewed-by: Trust Me
* | Small performance improvement: don't match the bus path.Thiago Macieira2009-11-241-3/+2
| | | | | | | | | | We trust the bus, so no need to match per path. The sender and the interface should be enough for us.