summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QVarLenghtArray: Add typedefs for stl compatibility.Gordon Schumacher2010-06-082-0/+56
| | | | | Merge-request: 599 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* prefer QElapsedTimer over QTimeRitt Konstantin2010-06-081-2/+2
| | | | | Merge-request: 678 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-089-152/+239
|\ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Allow to build Qt in static with mingw Protected call to glXChooseFBConfig with appropriate defines. Use the new OpenGL 3.* context/profile if asked with X11/GLX. Splitted attrib_list generation into buildSpec from QGLContext::tryVisual. Fix QTransform::map(const QPainterPath &) not working with paths that
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-079-152/+239
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Allow to build Qt in static with mingw Protected call to glXChooseFBConfig with appropriate defines. Use the new OpenGL 3.* context/profile if asked with X11/GLX. Splitted attrib_list generation into buildSpec from QGLContext::tryVisual. Fix QTransform::map(const QPainterPath &) not working with paths that
| | * Allow to build Qt in static with mingwThierry Bastian2010-06-076-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions were marked with Q_DECL_IMPORT where they should just be Q_CORE_EXPORT. The reason is that this macro is expanded to nothing in case of static builds whereas Q_DECL_IMPORT isn't (it is a dllimport). That leads the linker to try to import it and it shouldn't. Task-number: QTBUG-10791 Reviewed-by: gabi
| | * Protected call to glXChooseFBConfig with appropriate defines.Samuel Rødal2010-06-071-0/+11
| | | | | | | | | | | | Reviewed-by: Trond
| | * Use the new OpenGL 3.* context/profile if asked with X11/GLX.Riku Palomäki2010-06-071-6/+69
| | | | | | | | | | | | | | | Merge-request: 609 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.Riku Palomäki2010-06-071-137/+144
| | | | | | | | | | | | | | | Merge-request: 609 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * Fix QTransform::map(const QPainterPath &) not working with paths thatSimon Hausmann2010-06-072-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | have only one element Replaced the isEmpty() check for the shortcut in map() with elementCount() == 0 Task-number: QTBUG-11264 Reviewed-by: Samuel
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-088-33/+172
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: New keys for media-related keys, common mobile keys Retrieve proper glyph outlines from Symbian^4 Make Fluidlauncher demo have same version as corresponding Qt Fix the building of sis files. Make symbian install to epocroot by default.
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-078-33/+172
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: New keys for media-related keys, common mobile keys Retrieve proper glyph outlines from Symbian^4 Make Fluidlauncher demo have same version as corresponding Qt Fix the building of sis files. Make symbian install to epocroot by default.
| * | | New keys for media-related keys, common mobile keysIain2010-06-073-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various new keys: - introduce a proper key for pausing media - the existing Key_Pause was mapped to the Pause/Break key on a QWERTY keyboard. (In order not to break BC on applications that have been using the directfb keyboard map, the key mapping for DIKS_PLAYPAUSE *was not* updated). - introduce explicit keys to handle the case where play/pause is a single (toggling state) key rather than two discrete keys; same thing for a toggling version of call/hangup. - add new keys for voice dial and last number redial NOTE: Due to renumbering Key_Camera and Key_CameraFocus in order to make space in the more mobile-specific key range, this change introduces a binary compatibility break between this change and anything built before (ie. with Qt 4.7 beta 1 or earlier) (But not Qt 4.6, since the camera and camera focus keys were not in 4.6) Reviewed-by: axis Reviewed-by: Shane Kearns
| * | | Retrieve proper glyph outlines from Symbian^4Alessandro Portale2010-06-072-2/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until Symbian^4, the Symbian font Api does not provide access to the vector data of glyphs. In order to make QPainterPath::addText() and transformed text rendering work, Qt falls back to a workaound: Tracing the bitmap of a rasterized glyph. That is neither performant nor is the result of good quality. Symbian^4 will add Api that returns glyph outlines encoded as SVG paths. The code in this commit essentially parses the SVG path and returns a QPainterPath. The parsing part took some ideas from QSvg, and is implemented in a very reduced way. Task-number: QT-809 Reviewed-by: Aleksandar Sasha Babic
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-073-13/+24
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make Fluidlauncher demo have same version as corresponding Qt Fix the building of sis files. Make symbian install to epocroot by default.
| | * | Make Fluidlauncher demo have same version as corresponding QtMiikka Heikkinen2010-06-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make Fluidlauncher demo update properly in Symbian when using quiet installer, it needs proper version number instead of always having default 1.0.0. Task-number: QTBUG-11265 Reviewed-by: Janne Koskinen
| | * | Fix the building of sis files.Thomas Zander2010-06-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Stuff goes into various subdirs, these should be specified too. Reviewed-By: axis
| | * | Make symbian install to epocroot by default.Thomas Zander2010-06-071-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On symbian cross-compiling is the only way so the libraries and headers are all stored in symbian-specific ways which is called EPOCROOT. This change makes a configure without -prefix being passed in populate the EPOCROOT on 'make install'. When the user passes a prefix it will just do what a normal unix build does on make install.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-0719-12/+180
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 6db5de6d18c3ab8b74809303e4d79abacfc570a8
| * | | Updated WebKit to 6db5de6d18c3ab8b74809303e4d79abacfc570a8Simon Hausmann2010-06-0719-12/+180
|/ / / | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/31403> || [Qt] Disable pthread_setname_np. || || <https://webkit.org/b/38324> || [Qt] Fix compilation with QT_NO_FEATURE || || <https://webkit.org/b/40221> || REGRESSION(r60169): [Qt] Selected text is not drawn with the correct color. ||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed `make install' for qmediaplayer demo.
| * | | Fixed `make install' for qmediaplayer demo.Rohan McGovern2010-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | `sources.path += qmediaplayer.pro' where `sources.files += qmediaplayer.pro' was intended.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-079-45/+56
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed def file usage for Qt plugins under the makefile build system. Fixed def file usage for the makefile build system on the SDK plugin.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-059-45/+56
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed def file usage for Qt plugins under the makefile build system. Fixed def file usage for the makefile build system on the SDK plugin.
| * | Merge branch 'def_files_and_plugins' into 4.7-s60axis2010-06-049-45/+56
| |\ \
| | * | Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-048-39/+45
| | | | | | | | | | | | | | | | | | | | | | | | Previously it would not use the autogenerated def files. RevBy: Thomas Zander
| | * | Fixed def file usage for the makefile build system on the SDK plugin.axis2010-06-041-6/+11
| | | | | | | | | | | | | | | | RevBy: Thomas Zander
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-047-41/+269
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed unescaped backslashes in testcase.prf Skip tst_maketestselftest::make_check by default on Windows Fixed tst_maketestselftest on QWS and Windows. Add a test for the `make check' feature. Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf
| * | | | Fixed unescaped backslashes in testcase.prfRohan McGovern2010-06-041-2/+2
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-047-41/+269
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Skip tst_maketestselftest::make_check by default on Windows Fixed tst_maketestselftest on QWS and Windows. Add a test for the `make check' feature. Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf
| | * | | | Skip tst_maketestselftest::make_check by default on WindowsRohan McGovern2010-06-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nmake and checktest are too slow on Windows for this test to be enabled by default. Set RUN_SLOW_TESTS=1 to run the test manually.
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-037-41/+266
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed tst_maketestselftest on QWS and Windows. Add a test for the `make check' feature. Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf
| | | * | | | Fixed tst_maketestselftest on QWS and Windows.Rohan McGovern2010-06-033-5/+26
| | | | | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-037-41/+245
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add a test for the `make check' feature. Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf
| | | | * | | | Add a test for the `make check' feature.Rohan McGovern2010-06-025-6/+179
| | | | | | | |
| | | | * | | | Fix `make check' for debug-and-release on Windows.Rohan McGovern2010-06-021-2/+16
| | | | | | | |
| | | | * | | | Move `check' target for autotests into testcase.prfRohan McGovern2010-06-022-35/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testcase.prf is installed, thus allowing `make check' to work outside of the Qt source tree.
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-0416-20/+668
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 903617844b4341f7098b63b54e5be16cd83af647 Updated WebKit to de1e909b06cbc981d63e0fc0f6a3f84002dd1e80
| * | | | | | | Updated WebKit to 903617844b4341f7098b63b54e5be16cd83af647Simon Hausmann2010-06-044-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | || <https://webkit.org/b/40116> || [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed ||
| * | | | | | | Updated WebKit to de1e909b06cbc981d63e0fc0f6a3f84002dd1e80Simon Hausmann2010-06-0416-18/+650
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/39694> || [Qt] GraphicsLayer: warnings when reloading page || || <https://webkit.org/b/38762> || [Qt] Flash Plugin is not working on mac-cocoa-32 || || <https://webkit.org/b/39918> || REGRESSION(58615): Scroll events are sent twice per keypress for ports that don't have a platformWidget scrollbar || || <https://webkit.org/b/26224> || [Qt, Gtk] Allows build-webkit script to receive an install prefix as parameter || || <https://webkit.org/b/35861> || [Qt] Add documentation to the QtWebkit bridge || || <https://webkit.org/b/33176> || [Qt] The FIRST letter in the PASSWORD field is taken in UPPERCASE by DEFAULT in gmail.com web page ||
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-0413-5307/+9657
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Synchronizing to latest tree Adding correct hungarian translation Search local directory if no qconfig file found in src/corelib/global/ Fix QT_NO_CLIPBOARD Fix QT_NO_ACTION
| * | | | | | | Synchronizing to latest treeGarami Gábor2010-06-047-444/+1096
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | | | Adding correct hungarian translationGarami Gábor2010-06-048-5244/+8928
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations/assistant_hu.ts: Translated: 231 of 231 (100%) translations/designer_hu.ts: Translated: 85 of 1248 (6%) translations/linguist_hu.ts: Translated: 393 of 393 (100%) translations/qtconfig_hu.ts: Translated: 73 of 168 (43%) translations/qt_help_hu.ts: Translated: 80 of 81 (98%) translations/qt_hu.ts: Translated: 2402 of 2464 (97%) translations/qvfb_hu.ts: Translated: 65 of 65 (100%) Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | | | Search local directory if no qconfig file found in src/corelib/global/Tasuku Suzuki2010-06-041-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure script searched qconfig-local.h under src/corelib/global/ with "-qconfig local". After this commit, configure tries to find local directory if the file is not found in the path. Now you can pass the option like "-qconfig ./qconfig-myconfig.h" Merge-request: 2341 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | | | Fix QT_NO_CLIPBOARDTasuku Suzuki2010-06-042-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 658 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | | | Fix QT_NO_ACTIONTasuku Suzuki2010-06-042-1/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 657 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0417-244/+267
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add a note to the Linguist docs stating XLIFF 1.0 is not supported remove spurious empty lines in the linguist tools' output don't use qWarning() - or even qFatal()! - gratuitously. Styled item view backgrounds in Gtk+ Ensure that we only have one QLayoutStruct struct by renaming the other
| * | | | | | Add a note to the Linguist docs stating XLIFF 1.0 is not supportedAndy Shaw2010-06-041-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earliest version we support is XLIFF 1.1, so now this is made clearer. Task-number: QTBUG-9193 Reviewed-by: Morten Engvoldsen
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0416-242/+260
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: remove spurious empty lines in the linguist tools' output don't use qWarning() - or even qFatal()! - gratuitously. Styled item view backgrounds in Gtk+ Ensure that we only have one QLayoutStruct struct by renaming the other
| | * | | | | remove spurious empty lines in the linguist tools' outputOswald Buddenhagen2010-06-036-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ConversionData::error() does already newline-terminate the strings.
| | * | | | | don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-0311-186/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8044
generated by cgit v0.12 at 2025-08-19 09:59:52 (GMT)