summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-301-3/+6
|\
| * S60Style: buildbreak fix - missing lines from commit ↵Sami Merilä2009-04-301-3/+6
| | | | | | | | d333404c72aa6c707cf389899999f2247454b824
* | Fixed bug in QTemporaryFile::rename.Janne Anttila2009-04-301-2/+4
|/ | | | | | | The nativeInitFileName of file engine was not set in rename fallback case. Now it is set by calling: fileEngine()->setFileName This error was found with QNetworkDiskCache test case.
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-296-78/+332
|\
| * S60Style: Use title font for GroupBox title.Sami Merilä2009-04-291-0/+5
| |
| * S60Style: Styled QToolBar implementation.Sami Merilä2009-04-294-41/+258
| |
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-294-14/+37
| |\
| * | Basic optimizations to qdrawhelper for RVCT builds:Miikka Heikkinen2009-04-292-37/+69
| | | | | | | | | | | | | | | | | | | | | - Force static inline methods to be actually inline - Force ARM code for strategic methods RevBy: axis
* | | Fixed temporary file rename problem in Symbian OS.Janne Anttila2009-04-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian OS temp file rename will always go to fallback solution since close for temp file does not really close the handle. The fallback implements rename by copy and remove. But in symbian OS also the remove after copy failed since it was done through local 'in' object. However the file was still open in object doing the remove. The fix is to close the local 'in' object and use current 'this' object to remove the file. This object points to QTemporaryFile and it will make sure that temp file is first closed before trying to remove.
* | | Fixed tst_QSslSocket::sslErrors test for Symbian HW.Janne Anttila2009-04-291-12/+18
| |/ |/|
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-292-13/+29
|\ \
| * | Enable dynamic [de|con]struction of window surfaces based on visibilityJason Barron2009-04-282-13/+29
| |/ | | | | | | | | | | | | | | | | When a window becomes completely obscured either because it has been hidden or another window is completely covering it, the backing store should be deallocated to save memory and then re-allocated when the window is later made visible again. Reviewed-by: Iain <qt-info@nokia.com>
* | Increased stack size for threads created in QLocalSocket autotests.Janne Anttila2009-04-291-0/+6
| | | | | | | | | | The default stack size (8KB), caused KERN-EXEC 3 panics when executing tests in 5800 HW.
* | Fixed tst_QTcpSocket RVCT build when TEST_QNETWORK_PROXY is not defined.Janne Anttila2009-04-291-1/+2
|/ | | | | | RVCT compiles also unused inline methods etc, for this reason QNetworkProxy needs to be included even it is not really used for anything.
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-282-27/+31
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAleksandar Sasha Babic2009-04-281-2/+2
| |\
| | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-282-8/+8
| | |\
| | * | Fixed ASSERT panic in Symbian event dispatcher.Janne Anttila2009-04-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved ASSERT in QSelectThread::requestSocketEvents after mutex lock, since select thread might still have the lock and that's why the notifier might be in m_AOStatuses hash. After main thread has the mutex lock, notifier should not be anymroe in hash.
| * | | Simple refactoring how the data are fetched and stored.Aleksandar Sasha Babic2009-04-281-25/+29
| | |/ | |/|
* | | Always build Qt libs with "All -Tcb" capabilities in SymbianMiikka Heikkinen2009-04-281-5/+1
|/ /
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-281-1/+9
|\ \ | |/
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-281-6/+4
| |\
| * | These tst_qtcpsockets require more time to finish in Symbian OSJanne Anttila2009-04-281-1/+9
| | | | | | | | | | | | | | | | | | The modified test cases are: - disconnectWhileConnecting - disconnectWhileLookingUp
* | | Changed generated file headers to have timestamp in ISO format insteadMiikka Heikkinen2009-04-282-8/+8
| |/ |/| | | | | of localized format.
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-287-22/+43
|\ \ | |/
| * Fixed unresolved merge conflict in network-settings.hJanne Anttila2009-04-281-3/+0
| |
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-289-32/+182
| |\
| | * Removed setting the unnecessary parent for menu structuresMarkku Luukkainen2009-04-281-1/+0
| | |
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicMarkku Luukkainen2009-04-2810-33/+167
| | |\
| | | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-282-17/+129
| | | |\
| | | | * Qt lib dependencies had to be revisited as there were issues with someAleksandar Sasha Babic2009-04-271-4/+2
| | | | | | | | | | | | | | | | | | | | components when working on Tube HW.
| | | * | Removed preserving read-only flag from winscw deployed files to makeMiikka Heikkinen2009-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | functionality similar to hw deployment.
| | * | | Fixed wrong menu showing up on S60 while launching a dialog.Markku Luukkainen2009-04-283-11/+38
| | | | |
| * | | | Skipped disconnectWhileConnectingNoEventLoop for now in Symbian OS.Janne Anttila2009-04-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This test case hanhs the execution always and causes problems in nighly buils and automatic executions. Skip it until it is fixed.
| * | | | Fixed copy/paste error in QtNetworkSettings::expectedReplyFtp.Janne Anttila2009-04-281-3/+1
| | | | |
* | | | | Re-enabled winscw target for non-OS_WIN builds.Miikka Heikkinen2009-04-281-6/+4
| |_|_|/ |/| | |
* | | | Network server test related data (serever name, IP address ...) can nowAleksandar Sasha Babic2009-04-271-13/+127
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be read from a file at runtime. This should make auto testing more flexibile. Currently this is supported for Symbian platform. The file is named "iap.txt" and should be placed under "C:\data". When creating file use UNIX line ending and UTF 16 LE encoding. Conflicts: tests/auto/network-settings.h
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-271-2/+5
|\ \ \ | |/ /
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-273-10/+17
| |\ \
| * | | Enabled and fixed tst_QSslSocket::waitForMinusOne test for Symbian.Janne Anttila2009-04-271-2/+5
| | |/ | |/|
* | | Workaround for problems with paging Core and Sql libsMiikka Heikkinen2009-04-272-2/+14
| | |
* | | Make all Symbian binaries pageable by default.Miikka Heikkinen2009-04-271-1/+1
| |/ |/|
* | Minor optimization to symbian-sbsv2 extra target predeps generation.Miikka Heikkinen2009-04-271-1/+1
| |
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-27777-16674/+37974
|\ \ | |/
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-04-279-24/+404
| |\
| * | Fixed compilation of qmake on MSVC6.axis2009-04-273-3/+3
| | |
| * | Fixed a few typos in qmake makefile for win32.axis2009-04-271-1/+2
| | |
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-27774-16671/+37970
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe recompiled with MSVC6. Conflicts: configure.exe examples/network/network.pro src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qfilesystemmodel_p.h src/gui/kernel/qapplication.cpp tests/auto/_Categories/qmake.txt tests/auto/qfile/test/test.pro tests/auto/qfile/tst_qfile.cpp tests/auto/qlibrary/tst_qlibrary.cpp tests/auto/qline/tst_qline.cpp tests/auto/qstyle/tst_qstyle.cpp tests/auto/qtextstream/tst_qtextstream.cpp tests/auto/qtranslator/qtranslator.pro tests/auto/qwaitcondition/tst_qwaitcondition.cpp translations/qt_ja_JP.ts
| | * | Re-send network request properly when the socket is in Closing state.Denis Dzyubenko2009-04-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the "QAbstractSocket::connectToHost() called when already connecting/connected to <hostname>". The issue was that we were trying to call connect on a socket that was in a Closing state. We have to wait for the disconnected signal before we try to connect again. Reviewed-by: Prasanth
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-243-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6ebe3865025e2bb4d767a79435af4daf5a9b4db ) Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog Rubber-stamped by Ariya Hidayat. Fix qdoc warning about link to QAction::isEnabled. * Api/qwebpage.cpp: 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com>