summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-272-2/+16
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAleksandar Sasha Babic2009-05-2784-688/+1641
| |\
| * | Enabling QTextEdit to handle Input Methods.Aleksandar Sasha Babic2009-05-272-2/+16
| | |
* | | Implemented task 247268 - Cleanup qeventdispatcher_unix.cpp.Janne Anttila2009-05-271-17/+7
| |/ |/| | | | | | | All qeventdispatcher_unix.cpp changes were reverted since, this file is not anymore used in Symbian OS branch.
* | Fixed qpen test case panic in Symbian OS.Janne Anttila2009-05-271-6/+6
| | | | | | | | | | | | | | | | "Expected data of type _bool_, got _int_ for element 2 of data with tag _differentColor_." FALSE and TRUE are defined to int in Symbian OS, buu test case expects boolean.
* | Fixed qsqldatabase test case compilation.Janne Anttila2009-05-271-1/+0
| | | | | | | | Unterminated `#if_ conditional, probably due to bad merge
* | Fixed qtemporaryfile test case compilation for Symbian OS.Janne Anttila2009-05-272-1/+5
| | | | | | | | | | Symbian mmp file format does not accept strings with quotes in defines. For this reason the SRCDIR need to be defined in sources.
* | Keep exported symbols the same between udeb and urel, although theIain2009-05-262-1/+6
| | | | | | | | | | | | | | | | implementation does nothing in urel Required to have udeb/urel compatibility between binaries. RevBy: Alessandro Portale
* | Update comment - this version might even make sense...Iain2009-05-261-1/+1
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicIain2009-05-26393-16140/+6682
|\ \
| * | S60Style: Tidy up the code - remove 'todo's.Sami Merilä2009-05-261-16/+7
| | |
| * | Increased few timeouts in qtimer test to compensate for delays caused by SymbianMiikka Heikkinen2009-05-261-10/+26
| | | | | | | | | | | | emulator startup.
| * | Reduced number of processes in one qprocess test case to avoid running outMiikka Heikkinen2009-05-261-6/+4
| | | | | | | | | | | | of process handles.
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-05-267-21/+34
| |\ \
| | * \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-268-32/+54
| | |\ \
| | | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicSami Merilä2009-05-262-6/+14
| | | |\ \
| | | * | | S60Style: Add reason for clearing style specific caches.Sami Merilä2009-05-264-18/+28
| | | | | |
| | * | | | Fixed tst_QLocalSocket::processConnection test case for Symbian.Janne Anttila2009-05-263-3/+6
| | | | | |
| * | | | | Made more space available for code section in QtGui library in symbian-sbsv2 ↵Miikka Heikkinen2009-05-261-1/+4
| | |_|/ / | |/| | | | | | | | | | | | | builds.
| * | | | Disabled building two versions of same library in qlibrary autotest for Symbian,Miikka Heikkinen2009-05-261-3/+10
| | | | | | | | | | | | | | | | | | | | as version tests are disabled in Symbian anyway.
| * | | | Fixed qlibrary autotest compilation error in symbian-abldMiikka Heikkinen2009-05-261-3/+4
| | |/ / | |/| |
| * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-05-261-1/+0
| |\ \ \
| | * | | Compile on Qt/Symbian.Jason Barron2009-05-251-1/+0
| | |/ / | | | | | | | | | | | | | | | | The 'in' variable was removed in f1e9c0f3d2 so we don't need this line anymore.
| * | | Commented out include that was needed only by commented out codeMiikka Heikkinen2009-05-261-7/+12
| |/ / | | | | | | | | | and causing build problems for symbian.
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-2565-614/+1524
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfile.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp
| | * 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
generated by cgit v0.12 at 2025-01-06 22:44:54 (GMT)