summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAleksandar Sasha Babic2009-05-281-4/+2
|\
| * Optimize font DPI calculation by using cached value.Jason Barron2009-05-281-4/+2
| | | | | | | | | | | | | | The default DPI is stored in the S60 structure, so that can simply be used here instead of re-calculating it each time. Task-number: 247279
* | No need for this IP address.Aleksandar Sasha Babic2009-05-281-1/+0
|/
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAleksandar Sasha Babic2009-05-2715-139/+261
|\
| * Modify QDesktopWidget to emit proper signals on resize.Jason Barron2009-05-272-8/+65
| | | | | | | | | | | | | | | | | | | | | | The resize behavior of QDesktopWidget was somewhat undefined on Symbian because we weren't actually changing the size of the widget. This patch fixes that and also implements the resizeEvent() function so that it properly emits signals. We didn't call resize() to change the size here because our implementation of setGeometry_sys() ignores the desktop widget since it doesn't have a backing store and isn't a real window. Task-number: 253930
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-274-54/+46
| |\
| | * S60Style: Keep the background texture in static QPixmap pointer.Sami Merilä2009-05-274-54/+46
| | |
| * | Workaround for non-native makefile target names with symbian-abl.Janne Anttila2009-05-271-1/+5
| |/
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-273-46/+117
| |\
| | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-05-2714-57/+57
| | |\
| | * | Updated S60 installation docs.Miikka Heikkinen2009-05-273-46/+117
| | | |
| * | | Configured qtwidgets autotest to use default IAP without user prompts.Janne Anttila2009-05-271-0/+13
| | |/ | |/|
| * | Fixed qscriptv8testsuite test case out-of-memory crashes.Janne Anttila2009-05-272-1/+6
| | | | | | | | | | | | | | | Increased qscriptv8testsuite max heap size and skipped two test cases on Symbian which demand too much memory.
| * | Converted qstylesheetstyle test case to use qttest_p4.Janne Anttila2009-05-271-11/+1
| | | | | | | | | | | | | | | | | | qttest_p4 takes care of definign the UID3 for autotests in Symbian OS, among the other things. The UID3 is needed to run tests ih HW with cetest.
| * | Fixed qscriptv8testsuite test case deployment for Symbian.Janne Anttila2009-05-271-2/+2
| | | | | | | | | | | | Also gave more heap for test to run properly on Symbian.
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-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.
* | | | InputMethods supported enabled for QPlainTextEdit.Aleksandar Sasha Babic2009-05-272-3/+23
| |/ / |/| |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAleksandar Sasha Babic2009-05-2784-688/+1641
|\ \ \ | |/ /
| * | 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
generated by cgit v0.12 at 2025-08-17 04:07:59 (GMT)