summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed several qdoc error reports.Martin Smith2009-07-011-1/+1
| | | | | Also changed qdoc not to warn about undocumented parameters if the function is marked with the \reimp command.
* Fixes configure.exe silently disabling cetest even if you asked for itRohan McGovern2009-07-011-1/+9
| | | | | | when paths to the ActiveSync headers/libraries are not set up. Reviewed-by: Michael Goddard
* const ref for foreach()Oswald Buddenhagen2009-06-301-1/+1
|
* Linguist: defers the creation of the QPrinterThierry Bastian2009-06-302-8/+20
| | | | | | | | On windows, if your default printer is not reachable it would take a lot of time to fail to construct the print engine. During that time the UI would be frozen on the splash screen. Reviewed-by: ossi
* Merge branch '4.5'Marius Storm-Olsen2009-06-302-4/+14
|\
| * 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>
* | qdoc: Added more handling of \reimp commandMartin Smith2009-06-307-23/+47
| | | | | | | | | | | | Also fixed a few qdoc error reports. Task-number: 162182, 222650
* | fix column-spanning in Designer ConnectDialog's layoutRitt Konstantin2009-06-301-4/+4
| | | | | | | | | | | | | | if showAllCheckBox's text is longer than 1/2 of dialog's width then dialog became asymmetric. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | support editing of length variantsOswald Buddenhagen2009-06-2915-63/+442
| | | | | | | | | | | | | | | | | | this is not complete, e.g. full text search does not discern which variant contains the hit, the integration with phrases&guesses is non-existing, etc. the form preview will do funny things as long as the widgets don't support the multi-variant strings.
* | Remove trailing dot in tooltips.Ritt Konstantin2009-06-293-15/+15
| | | | | | | | | | Merge-request: 758 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fixed license header broken by 137bb787.Friedemann Kleint2009-06-291-2/+0
| |
* | Fixed configure.exe exiting with 0 exit code even if building host tools ↵Rohan McGovern2009-06-291-3/+3
| | | | | | | | (moc, uic etc) fails.
* | qdoc: Changed handling of reimplemented functions.Martin Smith2009-06-268-43/+245
| | | | | | | | | | | | | | | | | | | | There are now sections for "Reimplemented Public Functions" and "Reimplemented Protected Functions" in the summaries for each class. This isn't complete yet. It introduces a lot of qdoc warnings about undocumented parameters, but I will fix those. There is more to be done here but i want to get some feedback already. Task-number: 162182, 222650
* | Merge branch '4.5'Thiago Macieira2009-06-261-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
| * Bump Qt version number.Jason McDonald2009-06-257-17/+17
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5'Thiago Macieira2009-06-241-2/+2
|\ \ | |/ | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| * 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
* | 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
| |