summaryrefslogtreecommitdiff
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-066-23/+58
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Designer: Enable seconds editing for Q[Date]TimeEdit's properties.Friedemann Kleint2010-01-044-19/+53
| | | | | | | | | | | | | | | | 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
| * Designer: Selection handles disappear when using style sheet on form.Friedemann Kleint2010-01-041-2/+2
| | | | | | | | | | | | | | | | ... 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
| * do not accumulate messagesOswald Buddenhagen2010-01-041-2/+3
| | | | | | | | Task-number: QTBUG-6588
* | Deal with test cases that crash or hangShane Kearns2010-01-045-32/+182
|/ | | | | | | | | | | | | | 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
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-2220-0/+4419
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Fixed incorrect headers.axis2009-12-2218-252/+474
| | | | | | | | | | AutoTest: Passed RevBy: Paul Olav Tvete
| * Tool for launching symbian apps on the phone from windows command lineShane Kearns2009-12-2120-0/+4197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was ↵Carlos Manuel Duclos Vergara2009-12-217-794/+4
| | | | | | | | | | | | being included by src/xmlpatterns. Reviewed-by: Peter Hartmann
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-181-3/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | 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
| * doc: Added a missing \sa command, plus a \l in the text.Martin Smith2009-12-181-3/+3
| | | | | | | | Task-number: QTBUG-6288
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-172-3/+16
|\ \ | |/ |/| | | | | | | | | | | | | 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.
| * Designer: Fix compilation with -static on Mac OS XFriedemann Kleint2009-12-172-3/+16
| | | | | | | | | | | | | | | | 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
* | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-173-4/+47
|\ \ | |/ |/|
| * doc: Final fix. Example image links now display the image.Martin Smith2009-12-153-1/+47
| | | | | | | | Task-number: QTBUG-4484
| * doc: Fixed erroneous qdoc error message.Martin Smith2009-12-141-4/+1
| | | | | | | | | | | | | | qdoc reported a "No documentation" error for images used in examples, but these images aren't supposed to have documentation. Task-number: QTBUG-4484
* | fix build with namespaced qtOswald Buddenhagen2009-12-161-0/+2
| |
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-154-4/+13
|\ \
| * | Fix precision loss warning (qreal vs. float on Windows)Alessandro Portale2009-12-151-1/+1
| | | | | | | | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen modified: tools/linguist/linguist/messageeditor.h
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Justin McPherson2009-12-151-0/+2
| |\ \
| | * | Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+2
| | |/ | | | | | | | | | | | | | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-12-141-2/+9
| |\ \ | | |/ | |/| | | | | | | Conflicts: configure.exe
| | * Add -audio-backend and -no-audio-backend configure option.Kurt Korbatits2009-12-091-2/+9
| | | | | | | | | | | | | | | | | | Allow better control over audio backend used. Reviewed-by:Justin McPherson
| * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-091-1/+1
| |\ \
| | * \ Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-044-3/+10
| | |\ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-12-0316-46/+90
| | |\ \ \
| | * | | | Make lrelease link again with the win32-icc and win32-g++ mkspecsJan-Arve Sæther2009-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry
* | | | | | Designer: Show actions in action editor in QKeySequence::NativeTextFriedemann Kleint2009-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format as in Property editor and elsewhere for consistence. Task-number: QTBUG-6760
* | | | | | Designer: Handle "visible"-properties of item view headers correctly.Friedemann Kleint2009-12-102-105/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Fix broken delete key, some cleanup.kh12009-12-081-48/+68
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
* | | | | | Assistant: Fix race condition in index creation.ck2009-12-081-3/+1
|/ / / / / | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-12-073-5/+4
|\ \ \ \ \
| * | | | | make qdoc3 a proper tools subtarget and install itOswald Buddenhagen2009-12-042-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed for building qtmobility and qtcreator docs without magic. Reviewed-by: Daniel Molkentin
| * | | | | remove dead fileOswald Buddenhagen2009-12-041-5/+0
| | | | | |
* | | | | | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵Simon Hausmann2009-12-0510-26/+168
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | oslo-staging-1/4.6 into 4.6
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-047-11/+11
| |\ \ \ \ \
| * | | | | | doc: Example page now lists images used by the exampleMartin Smith2009-12-0410-26/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-041-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-031-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | * | | | | Fixed "illegal empty declaration" warning from \tools\xmlpatternsJanne Anttila2009-12-021-2/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following warning was reported by Symbian compilers: tools\xmlpatterns\main.cpp:83: warning: illegal empty declaration Reviewed-by: TrustMe
* | | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-039-14/+19
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-027-11/+11
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Bump version to 4.6.1Jason McDonald2009-12-017-11/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Creator crashes when reloading externally modified .ui files on MacPrasanth Ullattil2009-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-298-33/+77
| |\ \ \ \ | | |/ / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-271-0/+7
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fixed key handling in the documentation index widgetDenis Dzyubenko2009-11-251-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Assistant: Fix race condition in CLucene indexer.ck2009-12-012-0/+2
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | We need to make sure the running thread can respond to the cancel request before overwriting it. Reviewed-by: kh1
* | | | fix crash on closing all files under certain circumstancesOswald Buddenhagen2009-11-263-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | ignore Alt+Space acelerators - useless and too many false positivesOswald Buddenhagen2009-11-261-2/+13
| | | | | | | | | | | | | | | | Task-number: QTBUG-4429
View Lorry Controller Status