summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-15172-174/+18405
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for maemo6. Cleanup QEglContext & EGLDisplays Moved 'hasAlpha' property from GL2 engine to GL paint device. Remove useless qDebug in QTextCodec autotest QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded Add caching to QTextCodec::codecForName and QTextCodec::codecForMib Add benchmark for QTextCodec Fix several bugs with GL texture cache Compile fix for OpenGL ES. Fix missing/outdated license headers. Turned off subpixel AA text on surface with alpha in GL2 engine. Add functional Graphics View benchmarks. Make QCUPSSupport::printerHasPPD() clean up after itself. document the slowness of QPixmap::hasAlpha() Speed up custom bitmap brushes on X11 without Xrender support.
| * Fixed compile for maemo6.Rohan McGovern2010-02-132-2/+2
| | | | | | | | | | Explicit EGLNativeDisplayType casts are needed since maemo6 defines EGL_DEFAULT_DISPLAY as ((void*)0).
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-12172-174/+18405
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Cleanup QEglContext & EGLDisplays Moved 'hasAlpha' property from GL2 engine to GL paint device. Remove useless qDebug in QTextCodec autotest QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded Add caching to QTextCodec::codecForName and QTextCodec::codecForMib Add benchmark for QTextCodec Fix several bugs with GL texture cache Compile fix for OpenGL ES. Fix missing/outdated license headers. Turned off subpixel AA text on surface with alpha in GL2 engine. Add functional Graphics View benchmarks. Make QCUPSSupport::printerHasPPD() clean up after itself. document the slowness of QPixmap::hasAlpha() Speed up custom bitmap brushes on X11 without Xrender support.
| | * Cleanup QEglContext & EGLDisplaysTom Cooksey2010-02-1213-107/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | This basicaly replaces display(), openDisplay() & defaultDisplay() methods with a single display() and nativeDisplay(), the latter being implemented in the platform-specific files and everything else being cross-platform code. Reviewed-By: Trond
| | * Moved 'hasAlpha' property from GL2 engine to GL paint device.Kim Motoyoshi Kalland2010-02-128-24/+23
| | | | | | | | | | | | | | | | | | Got rid of an ugly switch statement. Reviewed-by: Tom
| | * Remove useless qDebug in QTextCodec autotestOlivier Goffart2010-02-121-5/+5
| | |
| | * QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec ↵Olivier Goffart2010-02-121-5/+6
| | | | | | | | | | | | | | | | | | cannot be loaded Reviewed-by: Denis
| | * Add caching to QTextCodec::codecForName and QTextCodec::codecForMibOlivier Goffart2010-02-121-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | Theses function are relatively slow, and often called with the same arguments Task-number: QTBUG-7888 Reviewed-by: Thierry Reviewed-by: Andreas
| | * Add benchmark for QTextCodecOlivier Goffart2010-02-125-1/+278
| | |
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-12147-52/+18022
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix several bugs with GL texture cache Compile fix for OpenGL ES. Fix missing/outdated license headers. Turned off subpixel AA text on surface with alpha in GL2 engine. Add functional Graphics View benchmarks. Make QCUPSSupport::printerHasPPD() clean up after itself. document the slowness of QPixmap::hasAlpha() Speed up custom bitmap brushes on X11 without Xrender support.
| | | * Fix several bugs with GL texture cacheTom Cooksey2010-02-125-37/+59
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Trond Autotest: tst_QGL::qglContextDefaultBindTexture
| | | * Compile fix for OpenGL ES.Kim Motoyoshi Kalland2010-02-121-1/+5
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| | | * Fix missing/outdated license headers.Jason McDonald2010-02-1264-960/+1065
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * Turned off subpixel AA text on surface with alpha in GL2 engine.Kim Motoyoshi Kalland2010-02-122-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subpixel antialiased text does not look good on translucent surfaces, so turn it off if the surface the text is rendered on has an alpha channel. This makes change eb84acd899aee992f5631ee0b9c0d992c8fbbd5a redundant. Task-number: QTBUG-7190 Reviewed-by: Gunnar
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-12140-8/+17829
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add functional Graphics View benchmarks. Make QCUPSSupport::printerHasPPD() clean up after itself. document the slowness of QPixmap::hasAlpha() Speed up custom bitmap brushes on X11 without Xrender support.
| | | | * Add functional Graphics View benchmarks.Bjørn Erik Nilsen2010-02-11137-0/+17817
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Widgets and use cases are externally developed and imported from: git://gitorious.org/+qt-performance-test-developers/qt/qt-performance-test-developers-clone.git (master branch, tests/benchmarks/uimodels/GraphicsViewBenchmark) I couldn't simply import everything because the benchmarks were heavily dependent on an internal measuring tool involving QtScripts and whatnot, not suitable for inclusion in the Qt repository. Everything is now converted into proper QTestLib compatible benchmark functions.
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-113-8/+12
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make QCUPSSupport::printerHasPPD() clean up after itself. document the slowness of QPixmap::hasAlpha() Speed up custom bitmap brushes on X11 without Xrender support.
| | | | | * Make QCUPSSupport::printerHasPPD() clean up after itself.Trond Kjernåsen2010-02-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This call "leaked" a temporary file in /tmp every time a QPrinter object was created. Not very nice at all. Task-number: QTBUG-6419 Reviewed-by: Kim
| | | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-02-1137-100/+332
| | | | | |\
| | | | | | * Speed up custom bitmap brushes on X11 without Xrender support.Trond Kjernåsen2010-02-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to fall back and go via draw_helper() if we're using a bitmap brush that's drawn using a solid color. Task-number: QTBUG-8140 Reviewed-by: Kim
| | | | | * | document the slowness of QPixmap::hasAlpha()Gunnar Sletta2010-02-111-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kim
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-151-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change a name of a variable to be more descriptive
| * | | | | | Change a name of a variable to be more descriptiveSami Merila2010-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when calculating a button content size, QS60Style has a variable called buttonWidth, which actually is the width of the content, not the button itself. Change this to buttonContentWidth. Reviewed-by: TrustMe
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-127-54/+94
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add make stub_sis target, and add webkit stub to qt.iby Fix to S60 softkeys when no active Qt window or native widget is shown.
| * | | | | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-124-43/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake - add targets to wrapper make file make stub_sis createpackage - use -s or --stub to run makesis with the -s argument also copies the file to the right place in epoc32\data\system\installs qt.iby - add qt_stub.sis and qt_webkit_stub.sis Task-number: QTBUG-6570 Reviewed-by: Miikka Heikkinen
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-123-11/+8
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix to S60 softkeys when no active Qt window or native widget is shown.
| * | | | | Fix to S60 softkeys when no active Qt window or native widget is shown.Janne Anttila2010-02-123-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys need to be updated also when Qt activewindow is set to NULL, this is needed that usecase where last Qt widget is closed works correctly. I.e. closed widget softkeys has to be removed, and replaced by default "Exit" softkey. Earlier only window activation or widget focusIn event caused softkey update. In addition IsDisplayingMenuOrDialog does not work correctly under all circumstances. Sometimes when menu is being launched the Qt gets focusChanged event before the menu is actually shown, but menu CBA is already created. This is fixed by checking that we update CBA only when AppUi CB is the current one. This assumption works as long as Qt uses only the CBA created by S60 application framwork and does not create other CEikButtonGroupContainer instances. Task-number: QTBUG-6115 Reviewed-by: Sami Merila
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1216-24/+20
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed several typos. Doc: remove \preliminary tag from public multimedia classes
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-124-4/+0
| |\ \ \ \ \
| | * | | | | Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
| |/ / / / / |/| | | | |
| * | | | | doc: Fixed several typos.Martin Smith2010-02-1212-20/+20
|/ / / / / | | | | | | | | | | | | | | | Task: QTBUG-7997
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-112-13/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again QNAM HTTP: Optimize detectPipeliningSupport() QNAM HTTP: Set channel to IdleState at better place
| * | | | | Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build ↵Simon Hausmann2010-02-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit with THUMB again This restores the library size and memory consumption. Reviewed-by: Janne Koskinen Reviewed-by: Iain
| * | | | | QNAM HTTP: Optimize detectPipeliningSupport()Markus Goetz2010-02-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do cheap checks first. Reviewed-by: TrustMe
| * | | | | QNAM HTTP: Set channel to IdleState at better placeMarkus Goetz2010-02-111-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The readyRead() from the expand() function called from allDone() had a new request triggered for that channel even if it is not really finished yet. Move the assignment to IdleState inside allDone to avoid this error. Reviewed-by: Andreas Kling Reviewed-by: Peter Hartmann
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-112-5/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: We need to export qBadAlloc() on all platforms
| * | | | We need to export qBadAlloc() on all platformsHarald Fernengel2010-02-112-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This supports the (documented) case when mixing Qt built without exception support with code that was built against Qt with exception support. Reviewed-by: Robert Griebl
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-111-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the perl download link and description in docs
| * | | | Fixed the perl download link and description in docsMiikka Heikkinen2010-02-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old link was defunct as the version it pointed is no longer available. Task-number: QTBUG-8134 Reviewed-by: TrustMe
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-111-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QXmlSchema: fix crash in schema parser
| * | | | QXmlSchema: fix crash in schema parserPeter Hartmann2010-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, annotations were only supposed to appear within elements of the form <element name="..."> ; However, they can also appear in elements of the form <element ref="foo:bar"> Patch-by: Tobias König <tokoe@kde.org>
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-113-9/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: now really fix the message editor for dark backgrounds
| * | | | now really fix the message editor for dark backgroundsOswald Buddenhagen2010-02-113-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of course, the palette was also set to explicitly white ... also remove the now obsolete transbox image. Task-number: QTBUG-7778
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-113-2/+103
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update Symbian DEF files
| * | | | Update Symbian DEF filesIain2010-02-103-2/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reserve ordinal numbers in the WINSCW DEF file for EGL exports from QtGui (now added, but marked as ABSENT) Update OpenVG DEF files for EABI and WINSCW Update QtGui DEF file for WINSCW with 2 non-EGL-related exports Reviewed-by: TrustMe
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-112-27/+21
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "(ODBC) Use wchar_t instead of assuming 2 bytes." Export a function to get dfb-surface from a pixmap
| * | | | Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."Bill King2010-02-111-27/+10
| | | | | | | | | | | | | | | | | | | | This reverts commit 4935ec52fc07d4aaa7ae594cfe9986e25ca62dcb.
| * | | | Export a function to get dfb-surface from a pixmapAnders Bakken2010-02-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is only exported when DirectFB is built as part of libQtGui. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1016-4/+60
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the WebKit build Blinking cursors are 2 pixels wide on Mac OS X/Cocoa. Fixed compilation with QT_NO_WHEELEVENT Take into account the solaris-cc-64-stlport mkspec Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ffae5e11181a3961193fa21ea405851cad714d4b )
| * | | | Fix the WebKit buildSimon Hausmann2010-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's PLATFORM(SYMBIAN) in 4.x, not OS() like in the trunk Reviewed-by: Trust me
generated by cgit v0.12 at 2025-03-06 22:56:20 (GMT)