| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
| |
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Change-Id: I30f996099346668f7b8067246c98b9ccc137ba57
|
|
|
|
|
|
|
|
| |
Change-Id: I0c289bdf555aa317dc12c5dbcff0168ebcc7bd50
Reviewed-on: http://codereview.qt.nokia.com/3935
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
(cherrypicked from a07f68eff5ac4696a551f083d186a685f7ef043d)
|
|
|
|
|
|
|
|
|
|
| |
And fix the file names/location, too
Change-Id: If2d5ec0896332896ad11af748ec8f75c39e1555c
Reviewed-on: http://codereview.qt.nokia.com/3890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
(cherrypicked from 8804ec49bda8672c5700ab843f2958c3d2bd8e41)
|
|
|
|
| |
Change-Id: I84119a3164018a4179f8a7187348865a30b3237a
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Using Q_ASSERT does nothing in release-mode builds, and in debug builds
it causes tests to terminate prematurely. It is much better to use
QVERIFY or QCOMPARE.
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
|
|/
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
I know not why...
Reviewed-by: Aaron Kennedy
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
| |
Check that sendMessage doesn't crash if service isn't connected.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Enable the remote debugging of QDeclarativeEngines only after
QDeclarativeDebugHelper::enableDebugging()
has been called.
Approved by 4.7 Program Team.
Reviewed-by: Alessandro Portale
Task-number: QTBUG-13762
|
|
|
|
|
|
|
| |
Always flush sockets after sending data, and make autotests more robust
by using busy wait.
Reviewed-by: Christiaan Janssen
|
|
|
|
|
|
| |
staging.
This reverts commit 31dcf2b4028b1f76301fc69fccff0a9474a0a135.
|
|
|
|
|
|
| |
Although it's a private header we use qdeclarativedebugservice_p.h in
creator / qmljsdebugger library. Working with a copy of the header in
the autotest hopefully catches some bc breakages.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The protocol so far was client->server only. That is, there was no
sane way for a client to check whether a plugin on the server (service)
was available or not. E.g. calling Client::setEnabled(true) 'succeeded',
without a check whether there is actually a service to talk to.
The new protocol replaces this shortcoming by a service discovery
mechanism: Both client & service announce their available plugins at
handshake time, and later on if there are changes. The status is
reflected in Client::status() and Service::Status() , which are either
NotConnected - no network connection, or not registered properly
Unavailable - TCP/IP connection works, but no plugin with the same
name on the other side
Enabled - You can connect to plugin on other side
The status changes happen automatically (no setEnabled() anymore).
Furthermore a version ID was added to the handshake, so that we can
extend the protocol further in the future :)
|
|
|
|
|
|
|
|
|
|
| |
The environment variables do not work for Symbian devices, so
without this change, QML debugging cannot be done on them.
In addition, configure now contains an option to disable qml
debugging entirely, due to it being a major security risk.
Reviewed-by: kkoehne
|
|\
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
|
| | |
|
|/
|
|
| |
Task-number: QTBUG-10035
|
|
|
|
|
|
| |
the engine until a debug client has connected. This makes for easier
debugging from Qt Creator when debugging C++ and QML together and when
debugging an application that has multiple engines.
|
| |
|
|
|
|
| |
to QDeclarativeXXX.
|
|
QDeclarativeXXX.
|