summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* BT: Namespace compile fixes.Norwegian Rock Cat2009-05-252-1/+2
| | | | | This broke again. I Need to get a way to automate this, I'll discuss with QA.
* fix warning in QtSvg if qreal == floatJoerg Bornemann2009-05-251-1/+1
| | | | Reviewed-by: mauricek
* don't build examples/qtconcurrent/qtconcurrent.pro by default on Win CEJoerg Bornemann2009-05-251-1/+4
| | | | | | | | This examples doesn't make much sense on most Windows CE devices. Task-number: 254433 Reviewed-by: mauricek BT: yes
* add deployment rules...Maurice Kalinowski2009-05-253-0/+15
| | | | | | | | | | WinCE needs those files to be able to do something useful Task-number: 254430 Task-number: 254437 Task-number: 254428 Reviewed-by: joerg BT: yes
* BT:Fix a clipping issue in tabbar tabsJens Bache-Wiig2009-05-251-4/+7
| | | | | | | | | | On XP and Vista where tabs use taboverlap, the currently dragged would loose the outline. We need to compensate for the taboverlap when creating the draggable widget, otherwise the outline will be clipped. Task-number: 254453 Reviewed-by: nrc
* BT: fix systray balloon crash bug on Windows CEJoerg Bornemann2009-05-251-13/+16
| | | | | | | | | | | | Its the context menu handling code... again. Problem is, that during execution of translateMouseEvent, the widget is closed and a modal message box is shown. After that, there's no widget at globalPos and thus, alienWidget is null. This patch just adds a null check for alienWidget. Task-number: 254425 Reviewed-by: mauricek BT: yes
* startup crash on WinCEMaurice Kalinowski2009-05-251-0/+3
| | | | | | | | | need to deploy the sqlite plugin, otherwise no model gets created, but referenced causing a crash. Task-number: 254435 Reviewed-by: joerg BT: yes
* Adding details to QSettings functionsMorten Engvoldsen2009-05-251-2/+11
| | | | | | | | | | Adding details to the documentation of custom storage format and related functions. Task-number: 207865 Rev-by: David Boddie Rev-by: Marius Storm-Olsen
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-251-8/+20
|\
| * BT: Prevent crash in Designer when using a scroll wheel to change a property.Norwegian Rock Cat2009-05-251-8/+20
| | | | | | | | | | | | | | | | | | | | | | There was some strangeness happening here with parents, but the main problem was the fact that wheel was getting sent to the focusframe and not to the widget below. However, the focusframe has the "transparent for mouse events" flag set and wheel events probably should be transparent as well. Task-number: 253539 Reviewed-by: Richard Moe Gustavsen
* | Changed qdoc to simplify the output for overloaded functions.Martin Smith2009-05-251-3/+1
|/ | | | Task-number: 249222
* Changed qdoc program to display version from QT_VERSION_STR.Martin Smith2009-05-251-1/+3
| | | | Task-number: 251486
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-252-0/+9
|\
| * BT: Mac: Crash when using QFontDialogRichard Moe Gustavsen2009-05-252-0/+9
| | | | | | | | | | | | | | | | | | | | If creating a native QFontDialog and delete it, the native dialog will still show. And worse, it will call the deleted QDialog counterpart. This fix will clean up (and close the native dialog) when the QDialog is deleted. Task-number: 254397 Reviewed-by: Trenton Schulz
* | qdoc: Moved some qdoc comments to a common cpp file.Martin Smith2009-05-254-87/+95
|/ | | | Task-number: 252488
* qdoc: Added some missing qdoc comments.Martin Smith2009-05-252-11/+14
| | | | Task-number: 252489
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-251-192/+203
|\
| * Integrate merge-request #532 into branch '4.5'Oswald Buddenhagen2009-05-250-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | axasia (1): Update japanese translation of Qt Assistant 4.5 Repository: git://gitorious.org/~axasia/qt/axasias-qt-clone.git Branch: 4.5_jp (26302d22f4dbf3482aacad89ad65bf5b7ed6ae53) Request-url: http://qt.gitorious.org/qt/qt/merge_requests/532 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Update japanese translation of Qt Assistant 4.5axasia2009-05-231-192/+203
| | |
| * | Update japanese translation of Qt Assistant 4.5axasia2009-05-251-192/+203
| | |
* | | qdoc: Added some missing qdoc comments.Martin Smith2009-05-258-57/+60
|/ / | | | | | | Task-number: 252491
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-2511-84/+139
|\ \
| * | BT: Clean up Mac -arch handlingLincoln Ramsay2009-05-251-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | Instead of the multiple character-string replacements, just check for the discrete -arch values that we want to find. This makes the code clearer and should reduce the chance of subtle errors. Reviewed-by: Jason McDonald
| * | Fix another compilation breakage introduced by the fix to theThiago Macieira2009-05-231-15/+0
| |/ | | | | | | | | | | | | | | | | compilation breakage introduced in 6c1d7e57. The fix in fc7a43cce did fix the failure, but created another one because qhostinfo_win.cpp also had a copy of qt_sockaddr_in6 Reviewed-by: Jason McDonald
| * Pressing enter in a QPlainTextEdit embedded on a itemview should insert a ↵Olivier Goffart2009-05-223-2/+82
| | | | | | | | | | | | | | | | | | | | newline Do the same special case as for QTextEdit (yes, this is a pitty that we have special cases like that Reviewed-by: Thierry Task-number: 252532
| * Fix compilation breakage on Windows caused by 6c1d7e57.Thiago Macieira2009-05-223-41/+32
| | | | | | | | | | | | | | On Windows, QT_NO_IPV6 isn't defined, but the necessary includes were missing. So #include winsock2.h and also use our own structures. Reviewed-By: Trust Me
| * Doc - updating the screenshotKavindra Devi Palaraja2009-05-221-0/+0
| | | | | | | | Reviewed-By: TrustMe
| * Fix syntax of the fcntl system call: this is not setsockoptThiago Macieira2009-05-221-6/+3
| | | | | | | | Reviewed-By: Oswald Buddenhagen
| * Fixes a potential crash when changing system palette with QGtkStyleJens Bache-Wiig2009-05-221-6/+7
| | | | | | | | | | | | | | | | | | The problem was that we installed an eventfilter regardless if the gtk symbols were defined or not. Instead we now initialize and check for the symbols before we install the filter. Task-number: 254342 Reviewed-by: ogoffart
* | qdoc: Added some missing qdoc comments.Martin Smith2009-05-251-0/+6
|/ | | | Task-number: 252493
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-2243-188/+980
|\
| * Fixed compilation with -qtnamespaceMarkus Goetz2009-05-229-18/+27
| | | | | | | | | | Task-number: 254333 Reviewed-by: Andy Shaw <qt-info@nokia.com>
| * Reset openMode to NotOpen when returning false from QFile::open()João Abecasis2009-05-221-0/+9
| | | | | | | | | | | | | | When connecting to an open file descriptor, set the openMode in the file system engine, as is done for file handles. Reviewed-by: Thiago
| * QTemporaryFile: really close files before renamingJoão Abecasis2009-05-221-0/+7
| | | | | | | | | | | | | | | | | | | | This gets temporary file renaming working on Windows, without requiring block-copying. While we could #ifdef this behavior for Windows, it's preferrable to maintain consistency in the exposed interface. Reviewed-by: Thiago
| * QTemporaryFileEngine now tracks if a fileName has been generatedJoão Abecasis2009-05-221-3/+18
| | | | | | | | | | | | | | | | | | | | | | With recent changes to QTemporaryFile, allowing the file to be closed, the engine has to keep track of whether a fileName has already been generated, so we don't generate new files after the first one. If the file is closed but we already have a name for it, then just forward the call to the base file engine. Reviewed-by: Thiago
| * QTemporaryFile: there's no need to keep another pointer to the engine hereJoão Abecasis2009-05-221-4/+1
| | | | | | | | | | | | Lifetime of the engine is already handled by the native engine. Reviewed-by: Thiago
| * QTemporaryFile: really (re)open file if it has been really closed...João Abecasis2009-05-221-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | In some circumstances, the file descriptor in QTemporaryFile is actually closed and setOpenMode alone won't give us reOpen semantics. Added function to QTemporaryFileEngine that checks if we have open file handles. On open, if we currently hold no handles, re-open the file. Trying to open a new file while we hold open handles would lead to leaks, so added an assert there, to be on the safe side. Reviewed-by: Thiago
| * Unconditionally open temporary files in ReadWrite modeJoão Abecasis2009-05-222-0/+16
| | | | | | | | | | | | | | | | | | | | | | Although QTemporaryFile hides QFile::open(OpenMode), this function is still available when accessing instance methods through the base class. Unconditionally setting ReadWrite allows the temporary file to be re-opened with different flags. Task-number: 248223 Reviewed-by: Thiago
| * QTemporaryFile: handle failures from QFSFileEngine::open(mode, fd)João Abecasis2009-05-221-9/+11
| | | | | | | | | | | | | | | | For now, this only happens if Append mode is requested and we're unable to seek to the end of the file. Theoretically, this could change in the future so it's better to err on the safe side. Reviewed-by: Thiago
| * Documentation fixJoão Abecasis2009-05-221-2/+2
| | | | | | | | | | | | | | | | We souldn't be returning an empty string for the fileName, just because the file is closed. E.g., after a rename, the file will be closed, but should still have a name. Reviewed-by: Thiago
| * QTemporaryFile would forget fileName while file was "closed"João Abecasis2009-05-222-1/+25
| | | | | | | | | | | | | | Note: this showed even if the file descriptor was kept open. Reviewed-by: Peter Hartmann Reviewed-by: Thiago
| * QTemporaryFile: don't clear filePath if remove failsJoão Abecasis2009-05-221-3/+5
| | | | | | | | | | | | Reviewed-by: MariusSO Reviewed-by: Peter Hartmann Reviewed-by: Thiago
| * Fix auto testJoão Abecasis2009-05-221-1/+8
| | | | | | | | | | | | | | | | | | When copying a resource file to the native file system the (read-only) permissions also get copied. On Windows platforms, this was preventing a test file from being deleted. Reviewed-by: Peter Hartmann Reviewed-by: Thiago
| * QFile::rename fallback: reset permissions and error state on successJoão Abecasis2009-05-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fallback implementation for rename operation should try to copy permissions from the original file to the destination file. Note that failures at this point are not treated as errors. Errors previously set by the native fileEngine are also reset before returning. Reviewed-by: Peter Hartmann Reviewed-by: Thiago
| * QFile::copy: close source file when using fallback mechanismJoão Abecasis2009-05-224-1/+37
| | | | | | | | | | | | | | Also added check in test case for rename fallback. Task-number: 165920 Reviewed-by: Thiago
| * Allow renaming QTemporaryFiles on windowsJoão Abecasis2009-05-221-9/+10
| | | | | | | | | | | | | | | | | | | | Changed the fallback implementation to use 'this' instead of a new QFile. This allows a QTemporaryFile to be block-copied to the destination and the source to be removed (QTemporaryFile is special because it isn't really closed). Reviewed-by: Peter Hartmann Reviewed-by: Thiago
| * Don't block copy sequential files in QFile::renameJoão Abecasis2009-05-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Block copying a sequential file is potentially a destructive operation, because there is no guarantee copy+remove will succeed. In these cases the fallback should not be tried. The user is better equipped to decide how to handle such failures and to ensure no data losses occur, e.g., copy without removing the original file. Reviewed-by: MariusSO Reviewed-by: Peter Hartmann Reviewed-by: Thiago
| * Don't loop around sigaction because it can't return EINTR.Thiago Macieira2009-05-221-16/+7
| | | | | | | | | | | | Asked by Oswald. Reviewed-by: Oswald Buddenhagen
| * Fixed potential bug caused by change b89efc8e7f32.Samuel Rødal2009-05-221-1/+1
| | | | | | | | | | | | | | If ensureSpace causes the layoutData to reallocate then the initialGlyphs pointers will no longer be valid. Reviewed-by: Simon Hausmann
| * Fixed text shaping bugs with ligatures and multiple font engines.Samuel Rødal2009-05-221-14/+26
| | | | | | | | | | | | | | | | If Harfbuzz shaping adds or merges glyphs we need to move the remaining glyphs in the glyph layout to compensate. Task-number: 253783 Reviewed-by: Simon Hausmann