| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroup
Changelog: Added Designer/uic entries for 4.6.1
Designer: Enable seconds editing for Q[Date]TimeEdit's properties.
Designer: Selection handles disappear when using style sheet on form.
do not accumulate messages
|
| | |
| |
| |
| |
| |
| |
| |
| | |
on UNIX, for which QLocale's ShortFormat does not include seconds.
Move format creation into browser utilities and use consistently
for display and editing.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-6965
|
| | |
| |
| |
| |
| |
| |
| |
| | |
... that has a white background color.
The selection handles inherited the form's stylesheet. Fix by parenting
them on the (internal) form container widget.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-6757
|
| | |
| |
| |
| | |
Task-number: QTBUG-6588
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added an optional timeout to runonphone - the application will be killed
after this time. Used when autotesting unattended, as some tests can hang.
Handled the just in time debug halting the application when it is about
to crash, by terminating the application. In future, we could capture a
call stack or something here.
Also added quiet/verbose options to control the amount of output from
runonphone.
Reviewed-by: Janne Koskinen
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| |\ \ |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: Oswald Buddenhagen
modified: tools/linguist/linguist/messageeditor.h
|
| | |\ \ |
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| |\ \ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
needed for building qtmobility and qtcreator docs without magic.
Reviewed-by: Daniel Molkentin
|
| | | | | | | |
|
| |\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | |
| | | | | | |
oslo-staging-1/4.6 into 4.6
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
It just links to an empty page at the moment, i.e., it doesn't
load the images. But I will add that.
Task-number: QTBUG-4484
|
| |\ \ \ \ \ \ \
| |_|_|/ / / /
|/| | | | / /
| | |_|_|/ /
| |/| | | | |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-staging2
|
| | | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The following warning was reported by Symbian compilers:
tools\xmlpatterns\main.cpp:83: warning: illegal empty declaration
Reviewed-by: TrustMe
|
| |\ \ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
| | |\ \ \ \ \
| | |/ / / /
| | | | / /
| | |_|/ /
| |/| | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On Mac QWidget::destroy() sends an AcceptDropsChange event after
clearing the guards for QPointer. This was used to store a QPointer to
the widget being deleted & that will never be cleared.
The fix removed the setAcceptDrops() from destroy. And as an extra
protection make sure designer will not treat that event as interesting.
Task-number: QTCREATORBUG-307
Reviewed-by: Denis Dzyubenko
Reviewed-by: Friedemann Kleint
|
| | |\ \ \ \
| | |/ / / |
|
| | |\ \ \ \
| | | |/ /
| | |/| | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On Mac up/down arrow keys move the cursor to the beginning/end of the lineedit,
however if the lineedit is used to control the indexwidget in assistant, we
need to prevent it to get those events and move the text cursor.
Reviewed-by: kh
|
| | |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We need to make sure the running thread can respond to the cancel
request before overwriting it.
Reviewed-by: kh1
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
after all, it is no good idea to announce the removal of all columns
just to let the view headers adjust themselves - it also makes the views
emit currentItemChanged() which has some undesirable side effects. so
don't do it an fix the header manually.
|
