summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-1721-117/+13
|\ | | | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
| * Fix incorrect year and version number in assistant docs.Jason McDonald2009-04-171-2/+2
| | | | | | | | | | Task: 251421 Reviewed-by: Trust Me
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-1721-116/+29
| |\
| | * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1Kavindra Devi Palaraja2009-04-161-1/+1
| | | | | | | | | | | | | | | | | | Task-number: 251346 Reviewed-by: TrustMe BT: Yes
| | * Remove obsolete code.Jason McDonald2009-04-161-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove the last few unnecessary directives using obsolete values of QT_VERSION. There are a few references to old QT_VERSION's left, but they are legitimate and should not be removed. Reviewed-by: Trust Me
| | * Remove obsolete pre-processor directives that check QT_VERSION.Jason McDonald2009-04-1616-96/+0
| | | | | | | | | | | | | | | Reviewed-by: Trust Me ....though discussed with three devs.
| * | Fix management of svg iconsJarek Kobus2009-04-172-9/+9
| | | | | | | | | | | | | | | Task: 251248 Revieved-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-152-9/+26
|\ \ \ | | |/ | |/|
| * | protect against circular inclusion of pro/pri filesOswald Buddenhagen2009-04-151-1/+7
| | | | | | | | | | | | Task-number: 250574
| * | do not crash on lines starting with an equal signOswald Buddenhagen2009-04-151-0/+3
| | |
| * | fix uninitialized variable readOswald Buddenhagen2009-04-151-4/+12
| | |
| * | add some commentsOswald Buddenhagen2009-04-151-4/+4
| | |
| * | Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
| |/ | | | | | | | | Use QUrl::fromLocalFile to construct the url string. Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* | Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
| | | | | | | | | | Use QUrl::fromLocalFile to construct the url string. Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-159-18/+52
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Display QAction keyboard shortcuts in action editor correctly.Friedemann Kleint2009-04-155-13/+25
| | | | | | | | Use PropertySheetKeySequenceValue instead of plain strings.
| * Fix typo.Morten Sørvig2009-04-141-1/+1
| | | | | | | | Reviewed-by: nrc
| * update/fix configureMaurice Kalinowski2009-04-082-3/+12
| | | | | | | | | | | | | | | | Reviewed-by: Thiago - display the nokia internal usage text like on configure - instead of skipping the license check we need to actually call it to set QT_EDITION and friends properly. Otherwise the build gets broken.
| * Don't check license for internal configurationsMarius Storm-Olsen2009-04-081-1/+2
| | | | | | | | | | | | | | A Nokia build doesn't require a license. Reviewed-by: mauricek BT: yes
| * compile with aCCOswald Buddenhagen2009-04-071-2/+2
| |
| * Fixes: Support for OpenGL ES 2.0 in configure.exe (Windows CE)Thomas Hartmann2009-04-071-1/+13
| | | | | | | | | | RevBy: Joerg Details: -opengl-es-2 option for configure.exe
* | Added copyright headers for the new QWS keymap handling filesRobert Griebl2009-04-071-0/+41
| | | | | | | | | | | | | | Also removed the old obsolete qkbpc101_qws files. Somehow this removal got lost in the rebase before the keyboard handler refactoring commit. Reviewed-by: TrustMe
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-071-6/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
| * Merge commit 'ab56759cefbcf2072ac777f0d897e561f5a3c8af' into 4.5Joerg Bornemann2009-04-061-6/+6
| |\
| | * don't display warning message when calling checksdk -listJoerg Bornemann2009-04-011-6/+6
| | | | | | | | | | | | | | | | | | | | | checksdk -list now displays the list of available SDK without yielding the warning message "No SDK specified: Defaulting to ...". Reviewed-by: mauricek
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-061-21/+14
|\ \ \ | |/ /
| * | Make the configure.exe program work for the commercial release licenses.Thiago Macieira2009-04-041-21/+14
| | | | | | | | | | | | | | | Reviewed-by: TrustMe BT: yes
* | | Keymap support for QWS.Robert Griebl2009-04-023-0/+962
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for keymaps to the QWSKeyboardHandler. The keymaps can be generated by the kmap2qmap tool (see tools/ directory). The source keymaps can be standard Linux .kmap files. Changes to Qt: * completely refactored the Tty and Usb (now known as LinuxInput) handlers * removed the LinuxIS plugin (handled by LinuxInput now) * removed support for iPAQ, EBX and Zylonite keypads (obsolete hardware) * removed support for RAW tty mode. This could be re-added, for non-Linux systems by implementing a PC/AT scan-code to Linux keycode converter. New features for Tty and LinuxInput (ex Usb) handlers: * support for keymaps QWS_KEYBOARD=..:keymap=/path/to/x.qmap:.. * support for dead keys and the compose key * support for lock LEDs * support for key repeat rates (in ms): QWS_KEYBOARD=..:repeat-delay=x:repear-rate=y:.. * the default keymap supports latin1 composing via AltGr: QWS_KEYBOARD=..:enable-compose:.. * ctrl+alt+backspace application zapping can be disabled: QWS_KEYBOARD=..:disable-zap:.. * added virtual filter functions to both the Tty and the LinuxInput handlers. (QWSKeyboardHandler::processKeycode should be virtual in the first place, but that would be BIC) Still missing: * extended documentation for QWS_KEYBOARD Reviewed-By: Paul Olav Tvete Reviewed-By: Harald Fernengel
* | | amend 3570e978058816745101a69b552ad9d07e349542 for masterOswald Buddenhagen2009-04-021-5/+6
| | |
* | | don't lose codecForTr in c++ parserOswald Buddenhagen2009-04-021-1/+3
| | |
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-0215-63/+171
|\ \ \ | |/ / | | | | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5kh2009-04-021-9/+10
| |\ \
| | * | re-initialize some variables for each fileOswald Buddenhagen2009-04-021-5/+4
| | | |
| | * | fix evaluation of CONFIG() and contains()Oswald Buddenhagen2009-04-021-3/+4
| | | | | | | | | | | | | | | | cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206
| | * | fix wrong evaluation of arguments to qmake functionsOswald Buddenhagen2009-04-021-1/+2
| | | | | | | | | | | | | | | | cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator
| * | | fixes empty tab after pdf file open, new tab after middle mouse clickkh2009-04-022-3/+57
| | | | | | | | | | | | | | | | | | | | Task-number: none Reviewed-by: --global
| * | | fixes empty tab after pdf file openkh2009-04-021-3/+10
| |/ / | | | | | | | | | | | | Task-number: none Reviewed-by: --global
| * | fixes empty tab after pdf file openkh2009-04-022-6/+17
| | | | | | | | | | | | | | | Task-number: none Reviewed-by: --global
| * | duplicate message handling improvementsOswald Buddenhagen2009-04-029-68/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - lrelease will not abort on duplicates any more - lconvert now gets noisy, but only if messages within one file are duplicated (combining files with identical messages is ok) - lupdate stays silent, but will eliminate duplicates again - consolidate handling of dual-encoded and duplicate messages - for performance - instead of the format loader, now the app is responsible for calling the duplicate handler. this allows for the fine-grained control necessary for optimal performance. Task-number: 247738
| * | optimize duplicate resolutionOswald Buddenhagen2009-04-021-5/+26
| | | | | | | | | | | | use pointers in the index hash to avoid needless allocs and copies
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJarek Kobus2009-04-0217-126/+656
|\ \ \
| * | | fix 223949: Qt's translation should be installed only if Linguistshjk2009-04-021-5/+8
| | | | | | | | | | | | | | | | translation is found
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-0116-121/+648
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| | * | don't invoke the current item without selectionkh2009-04-011-18/+23
| | | | | | | | | | | | | | | | | | | | Task-number: none Reviewed-by: hjk
| | * | don't open the TopicChooser if no link is avaliablekh2009-04-012-35/+23
| | | | | | | | | | | | | | | | | | | | Task-number: none Reviewed-by: hjk
| | * | strip fragment and other parts from url in case of pdfkh2009-04-011-8/+16
| | |/ | | | | | | | | | | | | Task-number: part of 238496 Reviewed-by: hjk
| | * normalize file namesOswald Buddenhagen2009-04-012-2/+2
| | | | | | | | | | | | | | | | | | makes tool tips less ugly Task-number: 246114
| | * do not crash upon dnd-ing text into non-focused lineeditOswald Buddenhagen2009-04-011-0/+2
| | | | | | | | | | | | Task-number: 249519
| | * one more bogus trolltech => qtsoftware renameOswald Buddenhagen2009-04-011-1/+1
| | |
| | * fixes search for non latin1 characterskh2009-03-313-55/+482
| | | | | | | | | | | | | | | | | | | | | | | | | | | while parsing html files, we removed some entities the should have been converted to there native representation, thus we were not able to find them Task-number: 247732 Reviewed-by: hjk
generated by cgit v0.12 at 2024-10-26 15:37:46 (GMT)