summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
* Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-116-9/+56
|\
| * Pinchzoom example zooms more smoothDenis Dzyubenko2009-11-112-5/+18
| | | | | | | | | | | | | | Remember the scale factor so it won't reset each time a new touch sequence starts. Reviewed-by: Bradley T. Hughes
| * Fixed opening files in the findfile example.Denis Dzyubenko2009-11-101-1/+1
| | | | | | | | | | | | QDesktopServices::openUrl expects a proper url, not just a filename. Reviewed-by: Jedrzej Nowacki
| * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1016-217/+805
| |\
| * \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-104-59/+163
| |\ \
| * \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-101-0/+33
| |\ \ \
| * \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1054-265/+1161
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'origin/4.6' into 4.6-platformDenis Dzyubenko2009-11-09125-1381/+1758
| |\ \ \ \ \
| * | | | | | Modified windowflags manualtestDenis Dzyubenko2009-11-092-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a few buttons to maximize a window from the code. Reviewed-by: trustme
| * | | | | | Add error handling for SetTimer() with the sentinel timer idBradley T. Hughes2009-11-091-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SetTimer() fails when trying to delay sendPostedEvents(), emit a warning and try to continue. Reviewed-by: mauricek
* | | | | | | Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-11280-2839/+5756
|\ \ \ \ \ \ \
| * | | | | | | Autotest: fix compiling after qscopedpointer.h changed.Thiago Macieira2009-11-111-28/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCustomScopedPointer was moved to a private header since it's only a helper class. QScopedSharedPointer wasn't necessary since it can be replaced with QSharedDataPointer neatly. Reviewed-by: Jesper Thomschütz
| * | | | | | | Fixed QGraphicsEffectSource autotest after graphics effect API changes.Samuel Rødal2009-11-111-30/+20
| | | | | | | |
| * | | | | | | Correct URL format.Jason McDonald2009-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | Sort sections in changes file so things are easier to find.Jason McDonald2009-11-111-159/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-11-111-5/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * | | | | | | Document changes for Ian Walters.Rhys Weatherley2009-11-111-0/+3
| | | | | | | | |
| * | | | | | | | First pass review of changes file.Jason McDonald2009-11-111-301/+337
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup descriptions + reformat to 80 columns. Reviewed-by: Trust Me
| * | | | | | | QWS keymap changesRobert Griebl2009-11-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | | Documentation: Adding comments to QHoverEvent classMorten Engvoldsen2009-11-102-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explaining the difference between hover events and enter/leave/move events Task-number: QT-1116 Reviewed-by: Bjørn Erik Nilsen
| * | | | | | | exporting QGraphicsEffectSource is requiredDaniel Molkentin2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q3MainWindow and Q3TitleBar depend on it. Reviewed-By: dt Reviewed-By: Alessandro Portale
| * | | | | | | qfontcombobox auto test added to tests/auto/auto.proJoerg Bornemann2009-11-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | | Qt covers BC break in SymbianAlessandro Portale2009-11-101-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround: fntstore.h has an inlined function 'COpenFont* CBitmapFont::OpenFont()' that returns a private data member. The header will change between minor SDK versions, thus break BC. But Qt has to build on any SDK version and run on other versions of Symbian OS. Also Qt does not want to deliver that BC to Qt based apps. This hack performs the needed pointer arithmetic to get the right COpenFont* pointer, no matter if the 'Flexible Memory Model' is already supported or not. The author is not proud of this commit. Task-number: QT-2250 Reviewed-by: Iain Reviewed-by: Shane Kearns modified: src/gui/text/qfontdatabase_s60.cpp
| * | | | | | | Removed unused public Api from QS60StyleAlessandro Portale2009-11-106-85/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style::setStyleProperty() and QS60Style::styleProperty() were intended as generic property setter/getters, but are not needed anymore. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp modified: src/gui/styles/qs60style.h modified: src/gui/styles/qs60style_p.h modified: src/gui/styles/qs60style_s60.cpp modified: src/gui/styles/qs60style_simulated.cpp modified: src/s60installs/eabi/QtGuiu.def
| * | | | | | | Changelog updateJedrzej Nowacki2009-11-101-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changelog update contains all major changes in QtWebkit, QtScript and brief information about the state machine framework. Reviewed-by: Simon Hausmann
| * | | | | | | Removed mention of purged graphics effects from the documentation.Samuel Rødal2009-11-101-3/+3
| | | | | | | |
| * | | | | | | Added some changes to changes-4.6.0.Samuel Rødal2009-11-101-0/+13
| | | | | | | |
| * | | | | | | linguist changesOswald Buddenhagen2009-11-101-4/+34
| | | | | | | |
| * | | | | | | french translation of qt_helpPierre Rossi2009-11-103-1/+397
| | | | | | | |
| * | | | | | | Document change of qdoc3 binary location.Daniel Molkentin2009-11-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | | Doc: remove graphics for effects that are no longer in scope.Volker Hilsheimer2009-11-106-5/+15
| | | | | | | |
| * | | | | | | Add my changes to the 4.6.0 changelogJørgen Lind2009-11-101-0/+4
| | | | | | | |
| * | | | | | | Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-1040-350/+593
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| | * | | | | | | Designer: Use toolbar in Signal/Slot editorFriedemann Kleint2009-11-101-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as in the other tool windows. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTCREATORBUG-239
| | * | | | | | | Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-099-90/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is internal, so it should live in its private header. The class was introduced during the lifetime of 4.6 (not in 4.5), so the move is binary compatible. Task-number: QTBUG-5617 Reviewed-by: João Abecasis <joao@abecasis.name>
| | * | | | | | | Code in gui/* should be completely namespacedhjk2009-11-091-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
| | * | | | | | | Assistant: Add missing initialization of member variable.ck2009-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
| | * | | | | | | Fix Assistant losing font settings across invocations.kh12009-11-092-62/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5333 Reviewed-by: ck
| | * | | | | | | Fix some warnings.kh12009-11-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| | * | | | | | | Assistant: Fix bugs related to setting the current filter remotely.ck2009-11-093-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Filter combo box now gets updated on remote setCurrentFilter. 2. Argument to remote setCurrentFilter now gets checked. If there is no such filter, we reject it.
| | * | | | | | | record id-based messages even if they have an empty sourceOswald Buddenhagen2009-11-068-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes sense if one uses lupdate only for validation purposes, i.e. to find out if the code uses only ids which are defined in some external specification.
| | * | | | | | | handle messages with ids (more) correctlyOswald Buddenhagen2009-11-0613-53/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when comparing two messages which both have ids, compare only the ids. this affects finding/reporting duplicates and merging.
| | * | | | | | | kill TranslatorMessage::operator==() and qHash(TranslatorMessage)Oswald Buddenhagen2009-11-065-29/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preparation work ...
| | * | | | | | | eliminate TranslatorMessagePtr from the Translator apiOswald Buddenhagen2009-11-066-48/+51
| | | | | | | | |
| | * | | | | | | improve ordered message insertionOswald Buddenhagen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in a ts file, the top level categorization are the contexts, so it makes no sense to make messages adjoint by file when the context is different. a more clever algorithm which tries to order the entire contexts is conceivable. that would be advantageous for files which use multiple contexts subsequentially if each context appears in only one file.
| | * | | | | | | eliminate Translator::contains()Oswald Buddenhagen2009-11-063-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace the one use case with something more efficient
| | * | | | | | | eliminate Translator::replace()Oswald Buddenhagen2009-11-063-17/+3
| | | | | | | | |
| | * | | | | | | use right method to record new messagesOswald Buddenhagen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent with all other source parsers
| | * | | | | | | do not consider plural source in comparisonsOswald Buddenhagen2009-11-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | two messages with identical singular but different plural sources simply make no sense. this should be quite a bit faster, as it saves lots of QHash<QString,...> lookups.