summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add some boundary/spill protectionThiago Macieira2011-03-221-4/+8
|
* Correct the code: use ushorts, not QCharThiago Macieira2011-03-221-4/+4
|
* Add the SSE2 code we have in Qt 4.7 to the benchmarkThiago Macieira2011-03-221-0/+26
|
* Add a test for QString::fromLatin1 performace alternativesThiago Macieira2011-03-225-11/+414
|
* Remove the __attribute__((optimize)) marksThiago Macieira2011-03-221-11/+11
|
* Add a script that generates a string table of 8-bitsThiago Macieira2011-03-221-0/+203
|
* Add a benchmark for QString::fromLatin1Thiago Macieira2011-03-221-0/+36
|
* Add a feature to QTestLib to correct benchmark results.Thiago Macieira2011-03-2220-33/+134
| | | | | | | | | | | | | | | | | | | | | | Two special values are added to the measurement of benchmarks: a zero and a comparison. The "zero" value is to be used when the test incurs a non-negligible overhead just to run. The benchmark author should add an "empty" run that measures basically the overhead and set it to attribute QTest::Zero. The "zero" value will be subtracted from any benchmark measurements before reporting (currently the plain logger only). Note that all benchmark types don't make sense, notably those already measurement some kind of rate, like frames per second and bytes per second. The "baseline" value is the comparison (with the "zero" subtracted"). When the baseline is set, the library will instead report the ratio between the benchmark and the baseline, in percentage or a multiple (e.g. "75%" [of the time] or "10.0x" [faster]). Adding measurements in "robes" left for future improvement. This feature is not reviewed and will be reverted later.
* Fix warning about maybe-uninitialised use of variableThiago Macieira2011-03-221-0/+1
|
* Fix warning about comparing Qt::Orientation to QDeclarativeView::OrientationThiago Macieira2011-03-221-1/+1
|
* Fix warning about copy constructor not initialising base explicitlyThiago Macieira2011-03-221-0/+1
|
* Examples: Make the download example also print the SSL errorsThiago Macieira2011-03-221-0/+17
|
* Compile in C++0x modeThiago Macieira2011-03-221-10/+10
|
* Fix warning about "data" being unused.Thiago Macieira2011-03-221-0/+1
| | | | Reviewed-by: Trust Me
* Fix declaration: it's QT_DECL_ALIGN, not QT_DECL_ALIGNEDThiago Macieira2011-03-221-1/+1
|
* QSharedNetworkSession: Fix compile on AIX.Pierre Rossi2011-03-221-0/+2
| | | | Reviewed-by: Markus Goetz
* desinger: Add keyboard accellerator to 'Edit' menuhjk2011-03-221-1/+1
| | | | Reviewed-by: Friedemann Kleint
* Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-22291-2583/+12433
|\ | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp
| * Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-2212-22/+93
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro Added setSwitchPolicy to MeeGo graphicssystem helper API. Add /q switch to QMAKE_DEL_FILE command in symbian
| | * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-1912-22/+93
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-195-14/+34
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro
| | | | * Add flag for forcibly propagating backing store alpha to framebufferGareth Stockwell2011-03-184-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the following rules applies to the creation and blitting of the Symbian raster backing store: 1. Creation of backing store with an alpha channel: Backing store has an alpha channel only if !QWidget::isOpaque. 2. Pre-filling of backing store prior to paint loop: Backing store is filled with transparent pixels if !QWidget::isOpaque. 3. Blitting of backing store: CGraphicsContext::EDrawModeWriteAlpha is used (meaning that backing store alpha values are propagated into the frame buffer), if QWidget::isOpaque. In order for the direct camera viewfinder to be visible on DSA devices, alpha=0 must be written into the framebuffer in the region where the viewfinder will be displayed. This requires a backing store with an alpha channel (1), use of CGraphicsContext::EDrawModeWriteAlpha (3), but not pre-filling of the entire backing store (2). This patch adds a new enum value, QWExtra::BlitWriteAlpha, which can be used by camera backends to achieve the desired behaviour. Task-number: QTMOBILITY-1278 Reviewed-by: Jani Hautakangas
| | | | * Fixed unmatched quotes in s60installs.proGareth Stockwell2011-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Miikka Heikkinen
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-186-7/+58
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added setSwitchPolicy to MeeGo graphicssystem helper API.
| | | | * | Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-186-7/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets the application control whether or not automatic switching should be used, and also to completely disable switching if desired. Reviewed-by: Armin Berres
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-181-1/+1
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add /q switch to QMAKE_DEL_FILE command in symbian
| | | | * | Add /q switch to QMAKE_DEL_FILE command in symbianMiikka Heikkinen2011-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Builds will otherwise halt without giving reason if a wildcard is given in QMAKE_CLEAN in symbian-abld. Task-number: QTBUG-18207 Reviewed-by: axis
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-03-213-5/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Remember default of main container's object name. Designer: Do not translate page object names of QMdiArea.
| | * | | | | Designer: Remember default of main container's object name.Friedemann Kleint2011-03-212-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a default property value. Users can then safely reset it to its original value. The default-generated name previously led to the uic-generated file names to be different, causing build errors in IDE's. Task-number: QTBUG-18256
| | * | | | | Designer: Do not translate page object names of QMdiArea.Friedemann Kleint2011-03-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and page-based containers. Task-number: QTBUG-18244
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-03-2153-915/+2565
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (34 commits) Remove undefined symbol from tst_qwindowsurface. Fix def files Fixes: some text fields in PNG image files were not read Add an overloading function to flush(). Remove the check on flushRequested. Only enable RightToLeft forcing in OS X 10.6 and skip the test Make getters for staticContentsSupport and partialUpdateSupport virtual Fix some warnings in font code Change the way the unified toolbar is flushed. Fix grayscale antialiasing with DirectWrite engine Fix checking hintingPreference in Windows font database Add RightToLeft direction forcing to Core Text shaper Fix hebrew shaping of characters with multiple diacritics. Fix combining marks shaping without GPOS feature in HarfBuzz Introduce QFontEngineDirectWrite Add the ability to remove a toolbar from the unified toolbar. Move the Mac specific behavior in #ifdef. Remove useless variable. Optimize the rendering path for the unified toolbar. Remove useless statements. ...
| | * \ \ \ \ \ Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-21440-4580/+19637
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp src/opengl/qwindowsurface_gl.cpp
| * | | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-196-26/+234
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Changes to driver workarounds. Switch to raster also when last window is destroyed (on MeeGo). Fix accidental population of the disk cache with partial content Fix disk cache interaction for range retrieval HTTP requests. Clipboard/Windows: Fix a hang when sending to non-responsive clients.
| | * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-186-26/+234
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-173-5/+76
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Changes to driver workarounds. Switch to raster also when last window is destroyed (on MeeGo). Clipboard/Windows: Fix a hang when sending to non-responsive clients.
| | | | * | | | Changes to driver workarounds.Robin Burchell2011-03-171-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Force enable brokenFBOReadBack on non-Nokia v1.4 SGX drivers (as this is apparantly not fixed, except on the Nokia drivers) - Add debug when workarounds are enabled to ease debugging This fixes the following MeeGo bug: https://bugs.meego.com/show_bug.cgi?id=5616 Merge-request: 1144 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | | * | | | Switch to raster also when last window is destroyed (on MeeGo).Samuel Rødal2011-03-171-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will save GPU resources for applications that are in the background for most of the time and only show a window now and then. Reviewed-by: Armin Berres
| | | | * | | | Clipboard/Windows: Fix a hang when sending to non-responsive clients.Friedemann Kleint2011-03-171-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if clipboard viewer is responsive before sending the contents. This prevents Qt Creator from hanging when copying text while a debugging session with a crashed/stopped debuggee is in progress. Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> Task-number: QTBUG-17465
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-173-21/+158
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix accidental population of the disk cache with partial content Fix disk cache interaction for range retrieval HTTP requests.
| | | | * | | | | Fix accidental population of the disk cache with partial contentSimon Hausmann2011-03-172-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the disk cache does not support partial content, we should not try to store it in the cache altogether. Done-with: Jocelyn Turcotte Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
| | | | * | | | | Fix disk cache interaction for range retrieval HTTP requests.Simon Hausmann2011-03-172-21/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The disk cache API does not currently support retrieving partial content, it can only serve entire files. Therefore we disable the use of the cache for these kinds of requests, as indicated by the presence of the Range header field. Done-with: Jocelyn Turcotte Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-03-182-4/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: qmake vcproj generator: do not insert $(INHERIT)
| | * | | | | | | qmake vcproj generator: do not insert $(INHERIT)Joerg Bornemann2011-03-182-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will remove the warnings about undefined environment variables when building with IncrediBuild. The $(INHERIT) feature does not work in the "Create PCH through file" property of Visual Studio. It expands to an empty string but doesn't yield a warning in a standard VS build. Also, the value of "Create PCH through file" is supposed to be exactly the string as in the include statement of the cpp file. Done-with: Marius Storm-Olsen
| * | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-03-18197-1566/+9267
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (101 commits) Fixes detected by the static-check Fixup license headers in Lighthouse plugins Mac: add autorelease pools to create_sys Don't skip remaining events on unhandled events in xcb backend. Lighthouse: Xcb, compile fix for the glx path Lighthouse: Make sure we don't use xkbcommon Lighthouse: Add pkg-config check for opengl es2 Rename qnaclunimplemented -> qfunctions_nacl Rename qconfig-minimal-system-depenencies.h Add QT_NO_FILESYSTEMITERATOR. Add QT_NO_DYNAMIC_LIBRARY. Compile. NaCl: Dont force release builds. NaCl: disable libtiff. posix platformdefs: Add QT_NO_SOCKET_H. qpnghandler: Compile with QT_NO_IMAGE_TEXT. Lighthouse: Support Q_NO_CLIPBOARD. Compile. Fix CoreServices framework addition for qpa. Update NaCl mkspecs. ...
| | * | | | | | | | Fixes detected by the static-checkJørgen Lind2011-03-174-4/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This included added a license header on a moc file. Its nasty, but has to stay like that until we have a better sollution for generating moc files on uikit
| | * | | | | | | | Fixup license headers in Lighthouse pluginsJørgen Lind2011-03-17101-113/+441
| | | | | | | | | |
| | * | | | | | | | Mac: add autorelease pools to create_sysMorten Sorvig2011-03-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a couple of on-startup leaks.
| | * | | | | | | | Don't skip remaining events on unhandled events in xcb backend.Samuel Rødal2011-03-171-2/+6
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-17730-6261/+24045
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| | * | | | | | | | | Lighthouse: Xcb, compile fix for the glx pathJørgen Lind2011-03-161-0/+2
| | | | | | | | | | |