summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-0714-73/+203
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
| * Add basic Russian translation for qtconfigRitt Konstantin2009-07-061-0/+1
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add Russian translation for qvfbRitt Konstantin2009-07-061-0/+1
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian Qt phrase bookRitt Konstantin2009-07-061-10/+42
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Removed superfluous code in assistant's search module.ck2009-07-063-16/+6
| | | | | | | | Reviewed-by: kh
| * Fixed race condition in search module.ck2009-07-063-15/+21
| | | | | | | | | | Task-number: 257441 Reviewed-by: kh
| * Minor: fix spelling in configure.exe -help output.Thiago Macieira2009-07-021-1/+1
| | | | | | | | Reported via qt-bugs
| * Sync with QtCreator.kh2009-07-014-10/+94
| | | | | | | | Reviewed-by: kh
| * Sync with QtCreator.kh2009-07-011-9/+13
| |
| * Do not start Assistant without at least an empty page.kh2009-07-011-2/+5
| | | | | | | | | | | | | | | | Noticed while looking into task 256903, since in case there are no recent shown pages,we would start Assistant only showning the search. Task-number: 256903 Reviewed-by: kh
| * Improve QtHelp error reporting.Friedemann Kleint2009-07-011-2/+2
| | | | | | | | Reviewed-by: kh <qtc-committer@nokia.com>
| * Support the -qtlibinfix parameter already on Unix/MacMarius Storm-Olsen2009-06-301-4/+13
| | | | | | | | | | | | The configuration option was not added to the Windows configure. Reviewed-by: hjk
| * add Russian to the "'own' languages hack" until task #196275 will be closedRitt Konstantin2009-06-291-0/+1
| | | | | | | | | | Merge-request: 760 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-291161-2501/+2654
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| * Bump Qt version number.Jason McDonald2009-06-257-17/+17
| | | | | | | | Reviewed-by: Trust Me
| * fix crash when using plugin that supplies a QDesignerMemberSheetExtensionJoel Nordell2009-06-241-2/+2
| | | | | | | | | | | | | | | | plugins external to Qt Designer can not define objects inheriting from QDesignerMemberSheet, as that is defined in a private header. the functions isQt3Signal and isQt3Slot assume that all QDesignerMemberSheetExtension objects at QDesignerMemberSheet, but this is not the case with 3rd party plugins. Merge-request: 452 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-By: Thorbjørn Lindeijer
| * 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
| * Docs: remove reference to nonexistent fileJoerg Bornemann2009-06-192-2/+0
| | | | | | | | Reviewed-by: David Boddie
| * 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
| * 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
| * 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
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-06-101-1/+3
| |\
| | * don't let comments weaved into strings confuse usOswald Buddenhagen2009-06-101-1/+3
| | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe Task-number: 254260 Testcase: 323072@p4
| * | Spelling in docs.Jarek Kobus2009-06-101-1/+1
| |/
| * Bump qt-eclipse version number in docsJarek Kobus2009-06-091-1/+1
| |
* | Make Qt exception safer.Robert Griebl2009-06-1047-283/+155
| | | | | | | | | | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-083-24/+50
|\ \ | |/ | | | | | | Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp
| * Add a comment for the translator so the placeholders are describedAndy Shaw2009-06-061-0/+3
| | | | | | | | Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-11-19 11:28:13 (GMT)