| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
|
|
|
|
| |
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.
...
|
| | |
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| | |
Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Merge-request: 569
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | |
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| | |
Task-number: QTBUG-5066
|
| |
| |
| |
| |
| |
| |
| | |
This of course requires installing libdbus compiled for Windows CE too.
Task-number: QTBUG-9582
Patch-by: Romain Pokrzywka (from KDAB)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Task-number: QTBUG-8729
|
|\ \
| |/
|/|
| |
| |
| | |
Conflicts:
src/corelib/codecs/qtextcodec.h
tests/auto/gestures/tst_gestures.cpp
|
| | |
|
| |
| |
| |
| |
| | |
Merge-request: 2307
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
| |
Issue found while debugging KDE applications.
|
|
|
|
|
| |
Merge-request: 442
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
|
|
|
| |
avoid needless atomic operations
Merge-request: 442
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Task-number: QTBUG-5979
Reviewed-By: TrustMe
|
|
|
|
|
| |
Task-number: QTBUG-5979
Reviewed-By: TrustMe
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| | |
Conflicts:
mkspecs/macx-g++40/qplatformdefs.h
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
We trust the bus, so no need to match per path. The sender and the
interface should be enough for us.
|