| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added more specific clean targets for Symbian builds
Fixed incorrect headers.
Daylight savings time for Symbian.
Tool for launching symbian apps on the phone from windows command line
Fixes to winscw def files
Fixing compile error on armcc
|
| | | |
| | |
| | |
| | |
| | | |
AutoTest: Passed
RevBy: Paul Olav Tvete
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The tool uses TRK to launch the application.
TRK is a debug agent, available as a signed package for consumer phones.
For Nokia phones, it is distributed with carbide; for other manufacturers
it can be downloaded from their developer websites.
The launcher code is reused from Qt creator, with a patch to allow us
to pass command line arguments to the process being launched.
The "make run" target is enhanced to support running on target as well as
the emulator. Like the "make sis" target, the last platform to have been
built is the one that will be launched.
The runonphone tool needs to be built in a Qt environment configured for
windows, and requires at least windows XP (Symbian development requires
windows XP SP2). Current proposal is to include a statically linked exe
in the bin directory for binary packages.
Reviewed-by: Janne Koskinen
|
| | | |
| | |
| | |
| | |
| | |
| | | |
being included by src/xmlpatterns.
Reviewed-by: Peter Hartmann
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added a missing \sa command, plus a \l in the text.
Improve the performance of the Anomaly browser demo
doc: Fixed typos.
Fixed QResource to respect the explicitely set locale
Change QHostInfo to use 5 parallel lookup threads
Doc: fix typo
fix Cocoa build
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-6288
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fix compilation with -static on Mac OS X
Configure support for multiple include levels in qmake.conf hierarchy.
Stop the configuration if the test compiler cannot be found.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Avoid linking the solutions used by Designer twice (in the two
Designer libraries). Just use the include paths in case of
static linking.
Reviewed-by: Carlos Duclos <carlos.duclos@nokia.com>
Task-number: QTBUG-6863
|
| | |\ \
| | |/
| |/| |
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-4484
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
qdoc reported a "No documentation" error for images used in
examples, but these images aren't supposed to have documentation.
Task-number: QTBUG-4484
|
| | | | |
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
format as in Property editor and elsewhere for consistence.
Task-number: QTBUG-6760
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Implement the property sheet (isChanged/reset) correctly and do a
hack for resetting the visibility.
Task-number: QTBUG-6505
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: ck
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: kh1
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
This class had a lot of implementation details in the header,
which were moved to an internal private class.
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Allow a property to be given as third parameter instead of a method. If
no other parameter is given, the property value is returned; if a fourth
parameter is given, the property is set to the given value.
This allows the syntax
qdbus service path property
as a short form of
qdbus service path org.freedesktop.DBus.Properties.Get property
and the syntax
qdbus service path property value
as a short form of
qdbus service path org.freedesktop.DBus.Properties.Set property value
If the third parameter is neither a method nor a property, the
error message for the missing method is returned.
Merge-Request: 1143
Reviewed-By: Thiago Macieira
|
| |\ \ \ \
| | |/ /
| |/| | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Oswald Buddenhagen
modified: tools/linguist/linguist/messageeditor.h
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/network/access/qnetworkrequest.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
|
| | |\ \ \ |
|
| | | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | | |
uses of QT_DEPRECATED must be protected by #ifdef
Task-number: QTBUG-6649
Reviewed-by: João Abecasis
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | | |
Conflicts:
configure.exe
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Allow better control over audio backend used.
Reviewed-by:Justin McPherson
|
| | |\ \ \
| | |_|/
| |/| | |
|
| | | |\ \ |
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Thierry
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: kh1
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- Get rid of double container lookups for conditional access.
- count() == 0 => isEmpty().
Reviewed-by: kh1
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: kh1
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The QFileSystemWatcher signals the changing of a file several times,
with the first one coming too early. As a result, we are likely
checking a file that is not yet fully constructed.
The workaround/solution is to delay reacting to the change until
after the (hopefully) last signal from the QFileSystemWatcher.
Reviewed-by: kh1
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: kh1
|
| |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \
| | |/ / / / / |
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
needed for building qtmobility and qtcreator docs without magic.
Reviewed-by: Daniel Molkentin
|
| | | | | | | | | |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: kh1
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: kh1
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: kh1
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: kh1
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| |/ / / / / / |
|
