summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-2319-5/+49
|\ | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| * Fix compilation after the last change.Thiago Macieira2009-06-231-1/+2
| | | | | | | | | | | | | | | | | | The #include <phonon> header no longer exists. And the <Phonon> or <Phonon/Phonon> headers have never existed (neither for us nor for the Phonon sources). You have to select each and every header that you do want now. Reviewed-By: Marius Storm-Olsen
| * mark plural messages as such in the qm readerOswald Buddenhagen2009-06-231-0/+18
| | | | | | | | | | | | this contains both a "clean" code path based on translation count and a fallback path based on looking for "%n" (for languages with only one form).
| * add -input-codec option for qm readerOswald Buddenhagen2009-06-232-3/+10
| | | | | | | | | | basing the input codec on the locale was broken by design and didn't really work anyway. so adding this option really is a bugfix, kind of.
| * Fix missing member initialization.kh2009-06-2315-1/+16
| | | | | | | | Reviewed-by: ossi
| * Fix crash in widget box when using load mode "LoadCustomWidgetsOnly"Eskil Abrahamsen Blomfeldt2009-06-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | When loading the widget box with load mode "LoadCustomWidgetsOnly", it will create an empty category. This will indirectly cause a resize event to be posted for the tree widget of the widget box, which in turn will cause adjustSubListSize() to be called for each category item in the tree widget. Since the category has not yet been populated, the assumption in adjustSubListSize() that cat_item->child(0) is non-null would cause a crash. The fix is to return immediately if the category is empty. Reviewed-by: Friedemann Kleint
* | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+2
| | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* | qdoc: Fixed XHTML breakage again.David Boddie2009-06-221-2/+2
| | | | | | | | Reviewed-by: Trust me
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-192-2/+0
|\ \ | |/
| * Docs: remove reference to nonexistent fileJoerg Bornemann2009-06-192-2/+0
| | | | | | | | Reviewed-by: David Boddie
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-1812-142/+209
|\ \ | |/ | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| * Make it possible to drag bookmarks to the root item.kh2009-06-181-1/+2
| | | | | | | | Reviewed-by: kh
| * Cleanup.kh2009-06-182-117/+99
| | | | | | | | Reviewed-by: kh
| * Add Russian translation for Qt Assistant.Ritt Konstantin2009-06-172-0/+2
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add Russian translation for QtHelp.Ritt Konstantin2009-06-171-0/+1
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add Russian translation for Qt Linguist.Ritt Konstantin2009-06-171-0/+1
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian phrase book.Ritt Konstantin2009-06-171-23/+104
| | | | | | | | | | | | | | | | Several uncorrect phrases was re-translated. Added new common used phrases. Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * revert built-time qm generationOswald Buddenhagen2009-06-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | it simply breaks too much (embedded builds in particular). will come up with something better in master. note however, that the .qm files do NOT return to the repository. the release manager needs to run "make qm" before packaging, just like Qt-from-git users who want translations do (i.e., almost nobody). Reviewed-by: Jason McDonald
| * Blank out the Qt-3 area license headers in the qt3to4 resources.Morten Sørvig2009-06-164-0/+0
| | | | | | | | | | | | | | Avoid triggering the license checks in Qt 4. Replace characters between "/*" and "*/" with a space. Reviewed-by: Trust Me
* | qdoc: Fixed crash when a compact list section was empty.Martin Smith2009-06-181-24/+27
| |
* | Fix nasty qt3-qt4 porting trap: for a QStringList, lst.remove(lst.at(idx)) ↵David Faure2009-06-181-2/+2
| | | | | | | | | | | | used to only remove one item in Qt3, while it removes all occurrences of the item in Qt4 (remove==removeAll). To catch it I commented out remove(T) in my qlist.h, which caught this. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fixed an oversight in Qt Designer that prevents one from designing empty tab ↵J-P Nurmi2009-06-171-5/+7
| | | | | | | | | | | | widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fixed an oversight in Qt Designer that prevents one from designing empty ↵J-P Nurmi2009-06-171-4/+7
| | | | | | | | | | | | stacked widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Update license headers in files that are new in 4.6.Jason McDonald2009-06-175-10/+10
| | | | | | | | Reviewed-by: Trust Me
* | fix typoOswald Buddenhagen2009-06-161-1/+1
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-161-0/+10
|\ \
| * | Store promoted Widgets correctly in the ScratchPad.Friedemann Kleint2009-06-161-0/+10
| | | | | | | | | | | | | | | | | | | | | Add code to make promoted widget entries to widget DB to widget box form builder. Task-number: 233683
* | | Merge license header changes from 4.5Volker Hilsheimer2009-06-161147-2288/+2320
|\ \ \ | |/ / |/| / | |/
| * Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-161-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161143-2272/+2310
| | | | | | | | Reviewed-by: Trust Me
| * no point in ProFile being a QObjectOswald Buddenhagen2009-06-151-4/+1
| |
| * remove unused includesOswald Buddenhagen2009-06-152-2/+0
| |
| * remove pointless prisOswald Buddenhagen2009-06-151-2/+0
| |
| * We only need to filename, not the full path.kh2009-06-151-1/+1
| | | | | | | | Reviewed-by: kh
| * fix qm buildOswald Buddenhagen2009-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | so "qmake -r && make" worked fine ... but configure does not simply run "qmake -r". also, now we have to build lrelease even when we don't build the other tools. Reviewed-by: Jason McDonald Reviewed-by: mariusSO
* | purge dead codeOswald Buddenhagen2009-06-151-18/+4
| |
* | simplify ending()Oswald Buddenhagen2009-06-151-4/+3
| |
* | use textedit's signal instead of the textedit's document'sOswald Buddenhagen2009-06-151-4/+3
| |
* | centralize settingsOswald Buddenhagen2009-06-158-33/+128
| |
* | make the focus tracking insensitive to loss of actual window focusOswald Buddenhagen2009-06-154-26/+55
| |
* | greatly simplify exclusive selection handlingOswald Buddenhagen2009-06-154-73/+49
| |
* | make MessageEditor::activeEditor() & co. return a QTextEdit instead of aOswald Buddenhagen2009-06-152-37/+33
| | | | | | | | | | | | FormWidget all users need that anyway
* | don't let comments weaved into strings confuse usOswald Buddenhagen2009-06-151-1/+3
| | | | | | | | | | | | | | Task-number: 254260 cherry-picked 941a03814a5f8f7be93425f71ee65a4222d16899 after botched merge from 4.5
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-127-51/+61
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * We do only support files inside or in subdirs of the help project.kh2009-06-111-45/+49
| | | | | | | | | | Task-number: 255888 Reviewed-by: kh
| * fix arabic pluralsOswald Buddenhagen2009-06-111-2/+2
| |
| * add plural rules for urduOswald Buddenhagen2009-06-111-0/+1
| |
| * Fix wrong home shortcut, now set to ALT+Home.kh2009-06-111-1/+1
| | | | | | | | | | Task-number: 255875 Reviewed-by: kh
| * No need to bookmark emty pages.kh2009-06-112-1/+4
| | | | | | | | Reviewed-by: kh
| * fix hover selection of source stringsOswald Buddenhagen2009-06-101-0/+2
| | | | | | | | | | snatching ctrl-a from line edits seems to need a shortcut override for some time now
generated by cgit v0.12 at 2025-01-20 21:40:37 (GMT)