summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import change 932546 from phonon-svn.Justin McPherson2009-11-1391-91/+91
| | | | | | | | | r932546 | thiago | 2009-02-27 07:33:54 +1000 (Fri, 27 Feb 2009) | 1 line Update copyrights: Trolltech ASA -> Nokia Corporation Reviewed-by: Justin McPherson (cherry picked from commit 560d39aafb39c810a77948f04ddcdc568ac2b19d)
* Import change 950964 from phonon-svn.Justin McPherson2009-11-131-2/+2
| | | | | | | | | r950964 | dfaure | 2009-04-08 19:26:40 +1000 (Wed, 08 Apr 2009) | 2 lines fix compilation with -DQT_STRICT_ITERATORS Reviewed-by: Justin McPherson (cherry picked from commit 7fb34ca0f33c4869a3c7e35401d4b3ad8e77556e)
* Import change 953828 from phonon-svnJustin McPherson2009-11-131-1/+1
| | | | | | | | | | r953828 | tkrotoff | 2009-04-15 01:25:00 +1000 (Wed, 15 Apr 2009) | 1 line Fix qmath.h include: should be written <QtCore/qmath.h> instead of <qmath.h> in order to be consistent with the rest of the code that use <QtCore/...> Reviewed-by: Justin McPherson (cherry picked from commit 5d11248839cee3e22ebddcaffa2af59b34b37969)
* Doc: fix typoVolker Hilsheimer2009-11-131-1/+1
| | | | | Fixes: QTBUG-5167 (cherry picked from commit a4053a6e7a9a686433dc4814a5b52da3bc96969f)
* Doc: Link to the public bug tracker.Volker Hilsheimer2009-11-132-11/+24
| | | | (cherry picked from commit de76200652e05de34d99f111c64a051a49911034)
* Changes file updatedaavit2009-11-131-0/+2
| | | | (cherry picked from commit d1d6769da76a9ff83fd56e12bd331c5e4858ccca)
* doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-132-3/+10
| | | | (cherry picked from commit 0f82f5552830485151424b974f282a63892a077d)
* Pinchzoom example zooms more smoothDenis Dzyubenko2009-11-132-5/+18
| | | | | | | | Remember the scale factor so it won't reset each time a new touch sequence starts. Reviewed-by: Bradley T. Hughes (cherry picked from commit 791c4035c28257e5a8426e6519866546faaf5286)
* Fixed opening files in the findfile example.Denis Dzyubenko2009-11-131-1/+1
| | | | | | | QDesktopServices::openUrl expects a proper url, not just a filename. Reviewed-by: Jedrzej Nowacki (cherry picked from commit 64946cdc9a5e934132f5c21cbd85e4c21bb5e161)
* make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-131-0/+4
| | | | | Reviewed-by: mauricek (cherry picked from commit 3569a2c930ee171e4f1e05d0407cee7c971c721d)
* compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-132-1/+2
| | | | | | | Changed the signature of QT_OPEN to be the same on all platforms. Reviewed-by: thartman (cherry picked from commit c9aa65bf79fdd09ad5d6405ba1d127888e26fd26)
* Update the translations of Qt AssistantBenjamin Poulain2009-11-131-221/+230
| | | | | | | | Add the new translations for the string added by 500e71ab649a5053667ff3f9dc7d87730b565756 Update some translations (cherry picked from commit fb2652f6fb3b0a79daef346a85e50ed0e8e0c2cf)
* Add tr() to strings of Assistant that need to be translatedBenjamin Poulain2009-11-131-2/+2
| | | | (cherry picked from commit 500e71ab649a5053667ff3f9dc7d87730b565756)
* Validate the translation of Qt_help by PierreBenjamin Poulain2009-11-131-67/+67
| | | | (cherry picked from commit ea80fc7a97c39deeca6bb51d8441d755af1e0591)
* Autotest: fix compiling after qscopedpointer.h changed.Thiago Macieira2009-11-131-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 (cherry picked from commit 95db13345cd7b6b7cac8725fe2879aaf80233818)
* Fixed QGraphicsEffectSource autotest after graphics effect API changes.Samuel Rødal2009-11-131-30/+20
| | | | (cherry picked from commit 1a36403e3c21a60f81cd0244b84f21223b4216e9)
* Def files frozen for 4.6.0 RCv4.6.0-rc1Shane Kearns2009-11-1120-361/+21660
| | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748 (cherry picked from commit 3a492b3bcd3898335dd36b46906a5b9cce5120f3)
* Switch on DEF filesShane Kearns2009-11-111-10/+19
| | | | | | | | | | | | | | | | DEF files containing the frozen DLL exports are in use for Symbian OS builds, except developer builds (configured with -developer-build) The reason for this exception is that developer builds export additional private interfaces to allow autotests to inject or monitor the internal data of a class. These autotest exports are not part of the API or the binary interface, so they are excluded from DEF files. Task-number: QTBUG-4436 Reviewed-by: Jason Barron (cherry picked from commit 7b997d150c35ece3164d7e2b08701c962e6af1ed)
* Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748 (cherry picked from commit 9113737e9011b3cc9d69196650fcc11a7253408e)
* 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
| |