summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1227-46/+732
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-1227-46/+732
| |\ | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/corelib/tools/qscopedpointer_p.h src/gui/widgets/qlcdnumber.cpp
| | * Changes file updatedaavit2009-11-111-0/+2
| | |
| | * doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-111-1/+8
| | |
| | * Update the translations of Qt AssistantBenjamin Poulain2009-11-111-221/+230
| | | | | | | | | | | | | | | | | | | | | Add the new translations for the string added by 500e71ab649a5053667ff3f9dc7d87730b565756 Update some translations
| | * Fixing warnings in QScopedPointer test caseJoão Abecasis2009-11-111-1/+2
| | |
| | * qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-114-25/+41
| | | | | | | | | | | | | | | | | | | | | | | | ...in the \qmlmethod and \qmlsignal commands, and the corresponding "attached" ones. Previously, the type was not allowed, but it really should be there, which means the \qmlmethod and \qmlsignal commands should be updated throughout.
| | * qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-112-2/+5
| | | | | | | | | | | | In the Method Documentation and Signal Documentation sections.
| | * qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-117-88/+152
| | | | | | | | | | | | | | | | | | Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
| | * Def files frozen for 4.6.0 RCShane Kearns2009-11-1120-361/+21660
| | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | * 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
| | * Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | * Add tr() to strings of Assistant that need to be translatedBenjamin Poulain2009-11-111-2/+2
| | |
| | * Validate the translation of Qt_help by PierreBenjamin Poulain2009-11-111-67/+67
| | |
| | * 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
| | * 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
| | * First pass review of changes file.Jason McDonald2009-11-111-303/+336
| | | | | | | | | | | | | | | | | | Cleanup descriptions + reformat to 80 columns. Reviewed-by: Trust Me
| | * Document changes for Ian Walters.Rhys Weatherley2009-11-111-0/+3
| | |
| | * QWS keymap changesRobert Griebl2009-11-111-0/+6
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Documentation: Adding comments to QHoverEvent classMorten Engvoldsen2009-11-112-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-111-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-111-0/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Qt covers BC break in SymbianAlessandro Portale2009-11-111-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-116-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
| | * fix tst_qdatastream for Windows CEJoerg Bornemann2009-11-112-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | SRCDIR is empty on Windows CE, so it doesn't make sense to prepend a slash. No other autotest does this. Also, we must deploy test2.svg. Reviewed-by: thartman
| | * Changelog updateJedrzej Nowacki2009-11-111-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-111-3/+3
| | |
| | * Added some changes to changes-4.6.0.Samuel Rødal2009-11-111-0/+13
| | |
| | * linguist changesOswald Buddenhagen2009-11-111-4/+34
| | |
| | * french translation of qt_helpPierre Rossi2009-11-113-1/+397
| | |
| | * Document change of qdoc3 binary location.Daniel Molkentin2009-11-111-1/+6
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Doc: remove graphics for effects that are no longer in scope.Volker Hilsheimer2009-11-116-5/+15
| | |
| | * Add my changes to the 4.6.0 changelogJørgen Lind2009-11-111-0/+4
| | |
| | * make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-111-0/+4
| | | | | | | | | | | | Reviewed-by: mauricek
| | * Fixed opening files in the findfile example.Denis Dzyubenko2009-11-111-1/+1
| | | | | | | | | | | | | | | | | | QDesktopServices::openUrl expects a proper url, not just a filename. Reviewed-by: Jedrzej Nowacki
| | * My changeJarek Kobus2009-11-111-0/+4
| | |
| | * Designer: Use toolbar in Signal/Slot editorFriedemann Kleint2009-11-111-9/+10
| | | | | | | | | | | | | | | | | | as in the other tool windows. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTCREATORBUG-239
| | * Modified windowflags manualtestDenis Dzyubenko2009-11-112-0/+26
| | | | | | | | | | | | | | | | | | Added a few buttons to maximize a window from the code. Reviewed-by: trustme
| | * Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-119-70/+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-111-4/+5
| | | | | | | | | | | | And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
| | * Assistant: Add missing initialization of member variable.qt-info@nokia.com2009-11-111-0/+1
| | | | | | | | | | | | Reviewed-by: kh1
| | * tst_largefile.cpp Windows CE compile fixJoerg Bornemann2009-11-112-4/+9
| | | | | | | | | | | | Reviewed-by: thartman
| | * compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-112-1/+2
| | | | | | | | | | | | | | | | | | Changed the signature of QT_OPEN to be the same on all platforms. Reviewed-by: thartman
| | * Add error handling for SetTimer() with the sentinel timer idBradley T. Hughes2009-11-111-3/+11
| | | | | | | | | | | | | | | | | | | | | If SetTimer() fails when trying to delay sendPostedEvents(), emit a warning and try to continue. Reviewed-by: mauricek
| | * tst_qlistwidget compile fix for Qt without RTTIJoerg Bornemann2009-11-111-1/+1
| | | | | | | | | | | | Reviewed-by: thartman
| | * tst_qcombobox: compile without Qt3 supportJoerg Bornemann2009-11-111-2/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Fix Assistant losing font settings across invocations.kh12009-11-112-62/+67
| | | | | | | | | | | | | | | Task-number: QTBUG-5333 Reviewed-by: ck