Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-06-19 | 2 | -2/+0 |
|\ | |||||
| * | Docs: remove reference to nonexistent file | Joerg Bornemann | 2009-06-19 | 2 | -2/+0 |
| | | | | | | | | Reviewed-by: David Boddie | ||||
* | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-06-18 | 12 | -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. | kh | 2009-06-18 | 1 | -1/+2 |
| | | | | | | | | Reviewed-by: kh | ||||
| * | Cleanup. | kh | 2009-06-18 | 2 | -117/+99 |
| | | | | | | | | Reviewed-by: kh | ||||
| * | Add Russian translation for Qt Assistant. | Ritt Konstantin | 2009-06-17 | 2 | -0/+2 |
| | | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | ||||
| * | Add Russian translation for QtHelp. | Ritt Konstantin | 2009-06-17 | 1 | -0/+1 |
| | | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | ||||
| * | Add Russian translation for Qt Linguist. | Ritt Konstantin | 2009-06-17 | 1 | -0/+1 |
| | | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | ||||
| * | Update Russian phrase book. | Ritt Konstantin | 2009-06-17 | 1 | -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 generation | Oswald Buddenhagen | 2009-06-16 | 1 | -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ørvig | 2009-06-16 | 4 | -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 Smith | 2009-06-18 | 1 | -24/+27 |
| | | |||||
* | | Fix nasty qt3-qt4 porting trap: for a QStringList, lst.remove(lst.at(idx)) ↵ | David Faure | 2009-06-18 | 1 | -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 Nurmi | 2009-06-17 | 1 | -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 Nurmi | 2009-06-17 | 1 | -4/+7 |
| | | | | | | | | | | | | stacked widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> | ||||
* | | Update license headers in files that are new in 4.6. | Jason McDonald | 2009-06-17 | 5 | -10/+10 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | fix typo | Oswald Buddenhagen | 2009-06-16 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Volker Hilsheimer | 2009-06-16 | 1 | -0/+10 |
|\ \ | |||||
| * | | Store promoted Widgets correctly in the ScratchPad. | Friedemann Kleint | 2009-06-16 | 1 | -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.5 | Volker Hilsheimer | 2009-06-16 | 1147 | -2288/+2320 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Cleanup our usage of the term "Qt Software". | Jason McDonald | 2009-06-16 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 1143 | -2272/+2310 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | no point in ProFile being a QObject | Oswald Buddenhagen | 2009-06-15 | 1 | -4/+1 |
| | | |||||
| * | remove unused includes | Oswald Buddenhagen | 2009-06-15 | 2 | -2/+0 |
| | | |||||
| * | remove pointless pris | Oswald Buddenhagen | 2009-06-15 | 1 | -2/+0 |
| | | |||||
| * | We only need to filename, not the full path. | kh | 2009-06-15 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: kh | ||||
| * | fix qm build | Oswald Buddenhagen | 2009-06-15 | 1 | -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 code | Oswald Buddenhagen | 2009-06-15 | 1 | -18/+4 |
| | | |||||
* | | simplify ending() | Oswald Buddenhagen | 2009-06-15 | 1 | -4/+3 |
| | | |||||
* | | use textedit's signal instead of the textedit's document's | Oswald Buddenhagen | 2009-06-15 | 1 | -4/+3 |
| | | |||||
* | | centralize settings | Oswald Buddenhagen | 2009-06-15 | 8 | -33/+128 |
| | | |||||
* | | make the focus tracking insensitive to loss of actual window focus | Oswald Buddenhagen | 2009-06-15 | 4 | -26/+55 |
| | | |||||
* | | greatly simplify exclusive selection handling | Oswald Buddenhagen | 2009-06-15 | 4 | -73/+49 |
| | | |||||
* | | make MessageEditor::activeEditor() & co. return a QTextEdit instead of a | Oswald Buddenhagen | 2009-06-15 | 2 | -37/+33 |
| | | | | | | | | | | | | FormWidget all users need that anyway | ||||
* | | don't let comments weaved into strings confuse us | Oswald Buddenhagen | 2009-06-15 | 1 | -1/+3 |
| | | | | | | | | | | | | | | Task-number: 254260 cherry-picked 941a03814a5f8f7be93425f71ee65a4222d16899 after botched merge from 4.5 | ||||
* | | Merge commit 'origin/4.5' | Bjørn Erik Nilsen | 2009-06-12 | 7 | -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. | kh | 2009-06-11 | 1 | -45/+49 |
| | | | | | | | | | | Task-number: 255888 Reviewed-by: kh | ||||
| * | fix arabic plurals | Oswald Buddenhagen | 2009-06-11 | 1 | -2/+2 |
| | | |||||
| * | add plural rules for urdu | Oswald Buddenhagen | 2009-06-11 | 1 | -0/+1 |
| | | |||||
| * | Fix wrong home shortcut, now set to ALT+Home. | kh | 2009-06-11 | 1 | -1/+1 |
| | | | | | | | | | | Task-number: 255875 Reviewed-by: kh | ||||
| * | No need to bookmark emty pages. | kh | 2009-06-11 | 2 | -1/+4 |
| | | | | | | | | Reviewed-by: kh | ||||
| * | fix hover selection of source strings | Oswald Buddenhagen | 2009-06-10 | 1 | -0/+2 |
| | | | | | | | | | | snatching ctrl-a from line edits seems to need a shortcut override for some time now | ||||
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jarek Kobus | 2009-06-10 | 1 | -1/+3 |
| |\ | |||||
| | * | don't let comments weaved into strings confuse us | Oswald Buddenhagen | 2009-06-10 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe Task-number: 254260 Testcase: 323072@p4 | ||||
| * | | Spelling in docs. | Jarek Kobus | 2009-06-10 | 1 | -1/+1 |
| |/ | |||||
| * | Bump qt-eclipse version number in docs | Jarek Kobus | 2009-06-09 | 1 | -1/+1 |
| | | |||||
* | | doc: Fixed several qdoc warnings. | Martin Smith | 2009-06-11 | 2 | -2/+4 |
| | | |||||
* | | Reduce left-margins in qdoc | Jens Bache-Wiig | 2009-06-10 | 1 | -6/+3 |
| | | | | | | | | | | | | The current implementation is a bit hackish and does not work for all cases. It is better to remove it for now until we have a proper way of supporting it. | ||||
* | | Some adjustments to the documentation | Jens Bache-Wiig | 2009-06-10 | 1 | -32/+39 |
| | | | | | | | | | | Headers are slightly lighter now. Not all tables are affected by the changes any more. | ||||
* | | qdoc: Added new class names for different tables. | Martin Smith | 2009-06-10 | 1 | -20/+33 |
| | | | | | | | | | | | | | | | | class="valuelist" is for the table used for enum types. class="alignedsummary" is for summary sections aligned on the name. class="propsummary" is for the property summary section. class="toc" is used for tables of contents. class="generic" is used for all other tables. We might need to break this down more. |