summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Add the chart utility from qtestlib-tools."Rohan McGovern2010-07-2013-1488/+1
| | | | | | | | This reverts commit 453abe70fec02456aba2219025f5202060eaece1. Task-number: QT-3583 Reviewed-by: Jason McDonald
* Bump version number after 4.6.3 release.Jason McDonald2010-06-157-11/+11
| | | | Reviewed-by: Trust Me
* fix translations from some header files being omittedOswald Buddenhagen2010-06-071-0/+1
| | | | | | | | | add the containing directories of all files specified on the command line to the list of project roots. otherwise, the strings from headers which are included before being encountered on the command line will be omitted. Task-number: QTBUG-10345
* propagate code change back to .g sourceOswald Buddenhagen2010-06-031-1/+1
| | | | missed that in 60acaf5e
* re-add overriding of tool paths to configureOswald Buddenhagen2010-05-171-0/+5
| | | | | | | | unlike originally planned, we didn't remove the setting of the tool paths from the qmake specs - for compat reasons. however, that means that they will make the QT_BUILD_TREE handling in qtPrepareTool ineffective, which meant that the qt build would try to use the tools from an installed qt ...
* define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-141-5/+0
| | | | | | | | | | | | | | | the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
* create magic comment messages in "finished" stateOswald Buddenhagen2010-04-151-2/+7
| | | | | there is really no point in marking them "unfinished". later file rewrites would reset the state anyway.
* make QT_TR_NOOP work in static initializersOswald Buddenhagen2010-04-151-6/+47
| | | | | | | | | do that by ignoring all equal signs and everything between and including brackets. this makes static initializers look effectively like function definitions, thus creating proper context. Task-number: QTBUG-9276
* make HashString and HashStringList objects smallerOswald Buddenhagen2010-04-151-13/+10
| | | | | | | | | | qHash(QString) has only 28 bits, so we can use the upper bits for flagging whether the hash is valid. size effect: LP32: align(4, 4 + 4 + 1) = 12 vs. align(4, 4 + 4) = 8 LP64: align(8, 8 + 8 + 1) = 24 vs. align(8, 8 + 8) = 16 P64: align(8, 8 + 4 + 1) = 16 vs. align(8, 8 + 4) = 16
* remove pointless manual assignments from token type enumOswald Buddenhagen2010-04-151-6/+6
| | | | | making the range discontiguous just makes the switch() jump table bigger or not applicable at all.
* Don't build QtXmlPatterns' command line tools on Symbian.Frans Englich2010-04-091-1/+2
| | | | | | Brought up by Espen. Reviewed-by: Espen Riskedal
* no need for CONFIG += ordered hereOswald Buddenhagen2010-03-301-2/+0
|
* WhitespaceThomas Zander2010-03-194-38/+38
|
* Made runonphone flush all application output.axis2010-03-181-1/+1
| | | | RevBy: Shane Kearns
* Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-0/+6
| | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
* isalpha() is unspecified for values outside uchar and EOFOswald Buddenhagen2010-03-111-1/+1
| | | | Task-number: QTBUG-8907
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-101-0/+1
|\ | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed paint crash in Symbian for trasnclucent dialogs. Implemented QLibraryInfo::TranslationsPath for Symbian.
| * Implemented QLibraryInfo::TranslationsPath for Symbian.Janne Anttila2010-03-091-0/+1
| | | | | | | | | | | | | | | | Discussed with QtProd and they agreed "/resource/qt/translations" would be suitable path to return from QLibraryInfo::TranslationsPath. Task-number: QTBUG-8291 Reviewed-by: Miikka Heikkinen
* | fix "using namespace" recursion crashOswald Buddenhagen2010-03-051-8/+20
|/ | | | Task-number: QTBUG-8360
* update russian translations and phrasebookRitt Konstantin2010-03-021-0/+40
| | | | | Merge-request: 485 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Help system: Build search index with low priority.ck2010-03-012-2/+2
| | | | Reviewed-by: kh1
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-011-1/+6
|\ | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Preparation to enable OpenGLES 2.0 for Windows Mobile. Test modifications for the Windows Mobile platform. QAbstractItemView::setIndexWidget: remove the old widget from the QSet of persistent editors Fixed qgl autotest failures on Maemo. Skip complex FBO tests if combined depth-stencil isn't supported
| * Test modifications for the Windows Mobile platform.ninerider2010-02-271-1/+6
| | | | | | | | | | | | Test were changed to run in reasonable time on Windows Mobile. Also some test were skipped for instance those using OpenGL. OpenGL support for Windows Mobile is a forthcoming feature.
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-261-1/+1
|\ \ | |/ |/| | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: fix "configure -fast" on Windows for other maketools than nmake
| * fix "configure -fast" on Windows for other maketools than nmakeJoerg Bornemann2010-02-261-1/+1
| | | | | | | | | | Task-number: QTBUG-8562 Reviewed-by: ossi
* | Fix for cetest.David Laing2010-02-262-2/+4
|/ | | | | Recent refactorings of qmake caused cetest not to compile. This patch updates cetest to fix this issue.
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-195-0/+279
|\ | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed off-by-one blending errors in the NEON drawhelper code. Cetest extensions for Windows Mobile device power operations. Remote lib extensions for Windows Mobile device power operations.
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-195-0/+279
| |\ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Cetest extensions for Windows Mobile device power operations. Remote lib extensions for Windows Mobile device power operations.
| | * Cetest extensions for Windows Mobile device power operations.ninerider2010-02-193-0/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Options to reset (-reset) and change the power mode (-wake) of the device were added. The reset is needed to put the device in a defined state after an error has occurred. The unattended power mode ensures that the reset can be effected and that the device will not go to sleep. Reviewed by: Joerg
| | * Remote lib extensions for Windows Mobile device power operations.ninerider2010-02-192-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function to change the power mode and to reset the device were added. The reset is needed to put the device in a defined state after an error has occurred. The unattended power mode ensures that the reset can be effected and that the device will not go to sleep. Reviewed by: Joerg
* | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-192-0/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
* | | Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-192-0/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
* | | Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-192-225/+0
| | | | | | | | | | | | | | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. It breaks non-Symbian platforms.
* | | Revert "Factored epocRoot implementation out of qmake"axis2010-02-192-297/+0
| | | | | | | | | | | | | | | | | | This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. It breaks non-Symbian platforms.
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-198-128/+594
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake QWebView scrolling doesn't clear old elements before painting again
| * | Modified configure to detect SDK support for Symbian audio backendGareth Stockwell2010-02-181-1/+49
| | | | | | | | | | | | | | | | | | This version of configure.exe was compiled with MSVC 9.0. Reviewed-by: Miikka Heikkinen
| * | Added implementation of epocRoot() function to configureGareth Stockwell2010-02-183-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | Exposing epocRoot() to the configure application allows it to determine the location of the currently active Symbian SDK, so that support for optional SDK features can be checked. Reviewed-by: Miikka Heikkinen
| * | Removed duplicated implementation of readRegistryKeys from configureGareth Stockwell2010-02-183-125/+6
| | | | | | | | | | | | | | | | | | | | | Configure now shares - at the source level - a single implementation of this function with qmake. Reviewed-by: Miikka Heikkinen
| * | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-182-0/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
| * | Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-182-0/+225
| |/ | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1811-176/+151
|\ \ | |/ |/| | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Help system: Remove hard-coded qt namespace. Help system: Handle all Clucene exceptions.
| * Help system: Remove hard-coded qt namespace.ck2010-02-1811-58/+39
| | | | | | | | | | Task-number: QTBUG-7821 Reviewed-by: kh1
| * Help system: Handle all Clucene exceptions.ck2010-02-181-118/+112
| | | | | | | | Reviewed-by: kh1
* | Fix handling of Evaluation licenses on the Windows configure.exeThiago Macieira2010-02-171-1/+2
|/ | | | Reviewed-By: Marius Storm-Olsen
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-171-2/+3
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix broken image loading on windows.
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-161-2/+3
| |\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix broken image loading on windows.
| | * Fix broken image loading on windows.kh12010-02-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the url is valid and we could find the file in the compressed help, otherwise pass on an error message. We might have got garbage in the first patch, so the isEmpty() check was not sufficient. Do not integrate in master, since it was fixed already there. Task-number: QTBUG-8082, QTBUG-8248 Reviewed-by: ck
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-167-11/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) QLocalSocket::isValid on Windows must check for broken connection fix pipe handle leak in qlocalsocket_win.cpp GraphicsViewBenchmark: Run app in full screen mode on small desktops. Fix Thai text on Windows 7 Fix License headers. QTextCodec::codecForName. Insert in the cache in all cases. Prevented calling the pixmap filter implementations with null pixmaps. Make it possible to run benchmarks with the "-graphicssystem" switch. Add support for running the GraphicsViewBenchmark application manually. Bump version to 4.6.3. Fixed a GLX warning that occured with some Intel chipsets under X11. 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. ...
| * | Bump version to 4.6.3.Jason McDonald2010-02-157-11/+11
| |/
* | Fix QT_BUILD_KEY for Symbian.Miikka Heikkinen2010-02-161-10/+17
|/ | | | | | | | Symbian builds didn't set build key properly, so it defaulted to a Windows key. This caused problems with loading plugins. Task-number: QTBUG-7942 Reviewed-by: axis