summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-141-1/+1
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF: fixed typo in trace statement Update to def files for 4.7.0-beta1 Fixed installer_sis target for 4.7
| * Phonon MMF: fixed typo in trace statementGareth Stockwell2010-04-141-1/+1
| | | | | | | | | | | | | | This builds under RVCT 2.2 (although obviously the debug output will contain garbage), but causes a compiler error with RVCT 4. Reviewed-by: trustme
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1433-621/+999
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits) Revert "Removed double setting of _WIN32_WINNT" Revert "removed a few warnings on wince builds" removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER ...
| * Revert "removed a few warnings on wince builds"Paul Olav Tvete2010-04-131-4/+4
| | | | | | | | This reverts commit 6b2cf497268037a5c127affeef3e6efd055164ec.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1334-625/+1003
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits) removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix ...
| | * removed a few warnings on wince buildsThierry Bastian2010-04-131-4/+4
| | |
| | * Build fixThierry Bastian2010-04-121-10/+0
| | |
| | * Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7Tom Cooksey2010-04-123-2/+16
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/ds9/mediaobject.cpp
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1033-620/+999
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits) Fix the doc for QFrame::frameStyle Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D Add runtime check for GLX >= 1.3 before using glXCreatePixmap QDrawHelper: Reduce code duplications Improve matching X11 VisualIDs to EGL configs Remove obsolete function set_winapp_name() Speedup fetchTransformedBilinear in the fast_matrix case Allow y-interted pixmaps for brushes in GL2 paint engine Build fix for mingw Fix build with mingw (64 bit) Make configure.exe compatible with mingw 64 Adjust indentation e-Ink support cleanup Tweak the display update IOCTL calls Support 8-Track e-Ink devices Get stride from LinuxFB instead of calculating it ourselves. Use DIR_SEPARATOR when setting up variables for RCC and UIC in features. Fixed bug in QPainterPath::intersected(). Fix compile error with QT_NO_ANIMATION O(n^2) to O(n) optimization in QTreeWidget::selectedItems() ...
| | | * | Revert "Update Phonon ds9 backend to 4.4.0."Thierry Bastian2010-04-0733-620/+999
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19a3fc3bd817628070e5637caf158b0be79eee82. The phonon backend in 4.4.0 is outdated. Qt has the most recent one. Conflicts: src/3rdparty/phonon/ds9/iodevicereader.cpp
* | | | | QtWebKit: Corrects symbols visibility for JavaScriptCore.Jocelyn Turcotte2010-04-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it is now a static library, this configuration has to be added explicitely. This patch should be overwritten by the next WebKit import. Reviewed-by: Simon Hausmann
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-133626-151601/+318224
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fix the QWebHistory serialization auto-test Mark QWebFrame::overloadedSlots autotest as expected failure QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb* QtWebKit: Build fix for WinCE. Fix the build of webkit examples on platforms without OpenGL and Multimedia QtWebKit: Fix build on mac. QtWebKit: Fix build on WinCE, adding missing include path. QtWebKit: Add missing namespace wrapper temporarily until next import. QtWebKit: fix build with qws temporarily until next import. Update src/3rdparty/webkit from trunk. Fix failing assertions in debug builds Fix the build of webkit examples on platforms without OpenGL and Multimedia QtWebKit: Fix build on mac. QtWebKit: Build fix for WinCE. QtWebKit: Fix build on WinCE, adding missing include path. QtWebKit: Change the dependency from phonon to QtMultimedia. QtWebKit: Add missing namespace wrapper temporarily until next import. QtWebKit: fix build with qws temporarily until next import. Update src/3rdparty/webkit from trunk. QtWebKit: Re-add the dependency to the static linked JavaScriptCore
| * | | | QtWebKit: Fix the QWebHistory serialization auto-testJocelyn Turcotte2010-04-132-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch should be overwritten by the next WebKit import. Reviewed-by: Kent Hansen
| * | | | Mark QWebFrame::overloadedSlots autotest as expected failureKent Hansen2010-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's been failing in WebKit trunk for a long time (forever?), and the fix is not entirely trivial. The expected failure message has the link to the upstream issue, which has more detailed comments. Reviewed-by: Jocelyn Turcotte
| * | | | QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*Jocelyn Turcotte2010-04-1312-10/+20
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the include of an incompatible header inside platform guard macros. This commit should be overwritten with the next WebKit import. Reviewed-by: Simon Hausmann
| * | | | Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtWebKit module header unconditionally includes QtOpenGL, due to a syncqt bug. Apply the same workaround as in http://trac.webkit.org/changeset/53627 for OpenGL and Multimedia as link time dependencies for QtWebKit. Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
| * | | | QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-122-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Enables debug_and_release explicitely since qbase.pri does - Make DESTDIR always go in JavaScriptCore/<configuration>, not dependent on the debug_and_release config - Use different targets for debug and release to prevent file clashes This commit should be overwritten on the next WebKit import Reviewed-by: TrustMe
| * | | | QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-122-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch should be overwritten on next import from WebKit. Reviewed-by: TrustMe
| * | | | QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-126-0/+13
| | | | | | | | | | | | | | | | | | | | Rubber-stamped-by: Simon Hausmann
| * | | | QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-122-8/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qtwebkitStaging-4.7Jocelyn Turcotte2010-04-124-7/+16
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-1264-1038/+1800
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imported from 862268aeb7150d3795d05bfc05f661bb5c598a27 in branch qtwebkit-2.0 of repository git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git Reviewed-by: TrustMe
| * | | | Fix failing assertions in debug buildsSimon Hausmann2010-04-093-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick of http://trac.webkit.org/changeset/57320 Don't mix NDEBUG and DEBUG between JSC and WebCore.
| * | | | Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtWebKit module header unconditionally includes QtOpenGL, due to a syncqt bug. Apply the same workaround as in http://trac.webkit.org/changeset/53627 for OpenGL and Multimedia as link time dependencies for QtWebKit. Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
| * | | | QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-082-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Enables debug_and_release explicitely since qbase.pri does - Make DESTDIR always go in JavaScriptCore/<configuration>, not dependent on the debug_and_release config - Use different targets for debug and release to prevent file clashes This commit should be overwritten on the next WebKit import Reviewed-by: TrustMe
| * | | | QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the include of an incompatible header inside platform guard macros. This commit should be overwritten with the next WebKit import. Reviewed-by: Simon Hausmann
| * | | | QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-072-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch should be overwritten on next import from WebKit. Reviewed-by: TrustMe
| * | | | QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-066-0/+13
| | | | | | | | | | | | | | | | | | | | Rubber-stamped-by: Simon Hausmann
| * | | | QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-062-8/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| * | | | Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-063624-151389/+317257
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Imported from 839d8709327f925aacb3b6362c06152594def97e in branch qtwebkit-2.0 of repository git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git Rubber-stamped-by: Simon Hausmann
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1227-401/+1147
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus Fix build after MR 543 merged. Compile on 10.4. revert "Fix the Qt build on Mac OS X/Cocoa 64-bit" Remove expected failures after JavaScriptCore bug fix ...
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1027-401/+1147
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus Fix build after MR 543 merged. Compile on 10.4. revert "Fix the Qt build on Mac OS X/Cocoa 64-bit" Remove expected failures after JavaScriptCore bug fix ...
| | * | | revert "Fix the Qt build on Mac OS X/Cocoa 64-bit"Kent Hansen2010-04-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | It actually broke the build on Mac; another cherry-pick missing maybe. Reverted for now.
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 475f8c67522d8b3f3163dc3a6b24d6083fd0ac19 ) https://bugs.webkit.org/show_bug.cgi?id=36742 gcc for Symbian doesn't support gcc extensions like atomicity.h - disable
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 3b44f0650780e009764ddc0aa6eba7234a85aa72 ) Corrected name of (u)int64_t compile time assert. https://bugs.webkit.org/show_bug.cgi?id=36739
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 42ad198e900e439f01d2062ad93d03043c68a309 ) https://bugs.webkit.org/show_bug.cgi?id=36511 <rdar://problem/7753498> Safari freezes when using SPUTNIK JavaScript conformance check
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-078-359/+823
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 499bdb98708eba4bd40532c70179bf45b43ad068 ) Fixed <rdar://problem/7728196> REGRESSION (r46701): -(-2147483648) evaluates to -2147483648 on 32 bit (35842)
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( d4f1bc6ca356cc64e8991533ee293b4a0b196a3a ) Build fix for SPARC. Fix missing macro value.
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-074-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( f62e6e4f8e3b3a966543f93ad1cb9030ac2988e6 ) Add virtual memory tags for TCMalloc and WebCore's purgeable buffers.
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-0711-10/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 706b04f3796e60078c28335beb5f24a7b27cd328 ) Fix the Qt build on Mac OS X/Cocoa 64-bit [Qt] Symbian specific getCPUTime implemetation https://bugs.webkit.org/show_bug.cgi?id=34742 Fix the SP at ctiOpThrowNotCaught on Thumb2 (JSVALUE32) https://bugs.webkit.org/show_bug.cgi?id=34939 Add missing cast for !YARR (PPC) builds. Implement NEVER_INLINE and NO_RETURN for RVCT https://bugs.webkit.org/show_bug.cgi?id=34740 Typedef both JSChar and UChar to wchar_t in RVCT. https://bugs.webkit.org/show_bug.cgi?id=34560 Get rid of WINSCW hack for UnSpecifiedBoolType https://bugs.webkit.org/show_bug.cgi?id=28054 [Qt] use nanval() for Symbian as nonInlineNaN https://bugs.webkit.org/show_bug.cgi?id=34170
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( a24c08469482ad26321d0d4b777747b3ae33963c ) Date.UTC() should apply TimeClip operation. https://bugs.webkit.org/show_bug.cgi?id=34461
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( b620465e6f809ddb0f8ed0fb732e9f8498d94755 ) Fix a bug that Math.round() retunrs incorrect results for huge integers https://bugs.webkit.org/show_bug.cgi?id=34462
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-074-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( b9992e6339bc2bc30933303d3b888fb7eb4ae778 ) [Qt] WinCE buildfix after r52729 and fix for Q_BIG_ENDIAN typo. https://bugs.webkit.org/show_bug.cgi?id=34378 Buildfix for WinCE + style fixes (TLS_OUT_OF_INDEXES is not defined). https://bugs.webkit.org/show_bug.cgi?id=34380
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( da4f912a2f648d518628e1066dace894d1da7081 ) [Windows] Fix a bug of round() with huge integral numbers https://bugs.webkit.org/show_bug.cgi?id=34297
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-6/+16
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 8662fcc9bb1d374fa10114fe629f18290641cccc ) Remove trailing \ from inline function code https://bugs.webkit.org/show_bug.cgi?id=34223
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-102-2/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix build error in QtGui armv5 udeb Updated qtbench to build against modified QStaticText API Make compiling / linking a non-qt app work too on symbian/gcce When on Symbian use smaller files. Fixing the missing "\\" The cmd line arguments have not been delegated properly. Clear QFontCache TLS content before nullifying TLS pointer. Add --download option to runonphone Implement download support to TRK Launcher Fix library creation on symbian/gcce Update Symbian def files for 4.7 Various fixes for symbian/gcce building. Make encoding clear Fix 'make sis' working on symbian makefile based system again. Make shipped symbian scripts available from the build-dir bin dir.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-102-2/+3
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix build error in QtGui armv5 udeb Updated qtbench to build against modified QStaticText API Make compiling / linking a non-qt app work too on symbian/gcce When on Symbian use smaller files. Fixing the missing "\\" The cmd line arguments have not been delegated properly. Clear QFontCache TLS content before nullifying TLS pointer. Add --download option to runonphone Implement download support to TRK Launcher Fix library creation on symbian/gcce Update Symbian def files for 4.7 Various fixes for symbian/gcce building. Make encoding clear Fix 'make sis' working on symbian makefile based system again. Make shipped symbian scripts available from the build-dir bin dir.
| | * | Update Symbian def files for 4.7Shane Kearns2010-04-072-2/+3
| | |/ | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-101-1/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Reimplemented event() and sceneEvent() in video item, for BC. Fix Phonon build with mingw.