summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix handling of Evaluation licenses on the Windows configure.exeThiago Macieira2010-02-172-1/+2
| | | | Reviewed-By: Marius Storm-Olsen
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-17139-302/+336
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Change all ptrdiff_t to qptrdiff. HTTP backend: remove comment Fixed failure of maketestselftest with vcproj generator. Fixed compile of compilerwarnings test with vcproj generator. Fixed compile of qlibrary test with vcproj generator. Fixed compile of xmlpatterns tests with vcproj generator. Fixed compile of shm/sem tests with vcproj generator. Fixed compile of QtHelp tests with vcproj generator. Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespace Fixed compile of these tests when Qt is configured with -qtnamespace Check in sample license headers
| * Change all ptrdiff_t to qptrdiff.Thiago Macieira2010-02-179-23/+22
| | | | | | | | Reviewed-By: Bradley T. Hughes
| * HTTP backend: remove commentPeter Hartmann2010-02-171-1/+1
| | | | | | | | | | | | the date header always needs to be updated in the cache. Task-number: QTBUG-7466
| * Fixed failure of maketestselftest with vcproj generator.Rohan McGovern2010-02-171-1/+3
| |
| * Fixed compile of compilerwarnings test with vcproj generator.Rohan McGovern2010-02-173-3/+3
| | | | | | | | | | | | Rename the test C++ file from `test.cpp' to `test_cpp.txt'. When named `test.cpp', the build system will attempt to build it, which we don't want.
| * Fixed compile of qlibrary test with vcproj generator.Rohan McGovern2010-02-171-2/+7
| | | | | | | | | | | | COPY and DESTDIR_TARGET are defined by qmake when generating makefiles, but not when generating vcproj files. We need to do something different for the vcproj generator.
| * Fixed compile of xmlpatterns tests with vcproj generator.Rohan McGovern2010-02-1775-114/+73
| | | | | | | | | | These tests were adding the same SUBDIR multiple times from different projects. Don't do that.
| * Fixed compile of shm/sem tests with vcproj generator.Rohan McGovern2010-02-1731-46/+41
| | | | | | | | | | | | | | SUBDIRS+=../path/to/lackey from two different places means that qmake sees the lackey project twice. This breaks the vcproj generator. Make it so that lackey is only referred to once.
| * Fixed compile of QtHelp tests with vcproj generator.Rohan McGovern2010-02-1710-109/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | These tests were doing: SUBDIRS+=../../../tools/assistant/lib ... to ensure that part of Qt was built before building the test. That's a cute hack, but it's a bad idea: it breaks the vcproj generator to process the same subdir multiple times, and it also gives the very unintuitive result that doing `make clean' under tests/auto cleans out a part of the Qt build!
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1712-3/+127
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespace Fixed compile of these tests when Qt is configured with -qtnamespace Check in sample license headers
| | * Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespaceRohan McGovern2010-02-164-0/+12
| | |
| | * Fixed compile of these tests when Qt is configured with -qtnamespaceRohan McGovern2010-02-165-3/+12
| | |
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-02-169-46/+135
| | |\
| | * | Check in sample license headersJason McDonald2010-02-163-0/+103
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | 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-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-171-14/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed autotest failure in tst_QGraphicsScene::render on Maemo.
| * | | | | Fixed autotest failure in tst_QGraphicsScene::render on Maemo.Samuel Rødal2010-02-171-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fixed point code in the raster paint engine's drawEllipse() function causes rendering errors on ARM. Remove untested code and use the vector path fallback instead. Reviewed-by: Gunnar Sletta
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-175-348/+452
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed function names in audio input example to clarify meaning Tidied up debug output in audio input example Removed redundant strings from audio input example Cleaned up memory management in audio input example Changed variable names in audio input example to match Qt code style Made level calculation in audio input example work for all formats Removed unused variable from audio input example Update suspend/resume button label in audio input example Changed function names in audio output example to clarify meaning Cleaned up implementation of audio output example Tidied up debug output in audio output example Removed redundant strings from audio output example Cleaned up memory management in audio output example Changed variable names in audio output example to match Qt code style Made data generation in audio output example work for all formats Update suspend/resume button label in audio output example Added missing override in audio output example Only use unix-like tools when not building for Symbian in Windows.
| * | | | | Merge branch 'audio-examples' into 4.6Gareth Stockwell2010-02-164-339/+443
| |\ \ \ \ \
| | * | | | | Changed function names in audio input example to clarify meaningGareth Stockwell2010-02-162-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Tidied up debug output in audio input exampleGareth Stockwell2010-02-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Removed redundant strings from audio input exampleGareth Stockwell2010-02-162-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Cleaned up memory management in audio input exampleGareth Stockwell2010-02-162-36/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Changed variable names in audio input example to match Qt code styleGareth Stockwell2010-02-162-93/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed some names to better convey their meanings, e.g. button -> m_modeButton button2 -> m_suspendResumeButton Reviewed-by: trustme
| | * | | | | Made level calculation in audio input example work for all formatsGareth Stockwell2010-02-162-42/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code only worked correctly for little-endian PCM16 formats. If the audio input device does not support such a format, the example previously would not run. Reviewed-by: trustme
| | * | | | | Removed unused variable from audio input exampleGareth Stockwell2010-02-162-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Update suspend/resume button label in audio input exampleGareth Stockwell2010-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the mode is toggled, playback is always started, even if the audio input device was previously suspended. The label on the suspend/resume button must therefore be updated. Reviewed-by: trustme
| | * | | | | Changed function names in audio output example to clarify meaningGareth Stockwell2010-02-162-23/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Cleaned up implementation of audio output exampleGareth Stockwell2010-02-161-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Tidied up debug output in audio output exampleGareth Stockwell2010-02-162-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Removed redundant strings from audio output exampleGareth Stockwell2010-02-162-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Cleaned up memory management in audio output exampleGareth Stockwell2010-02-162-38/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Changed variable names in audio output example to match Qt code styleGareth Stockwell2010-02-162-92/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed some names to better convey their meanings, e.g. button -> m_modeButton button2 -> m_suspendResumeButton Reviewed-by: trustme
| | * | | | | Made data generation in audio output example work for all formatsGareth Stockwell2010-02-162-72/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code only worked correctly for mono PCM16 formats. This meant that: a) If the device did not support mono, but did support stereo PCM16, the tone would be played at the wrong pitch. b) If the device did not support little-endian PCM16 at all (admittedly unlikely), the example would not run. Reviewed-by: trustme
| | * | | | | Update suspend/resume button label in audio output exampleGareth Stockwell2010-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the mode is toggled, playback is always started, even if the audio output device was previously suspended. The label on the suspend/resume button must therefore be updated. Reviewed-by: trustme
| | * | | | | Added missing override in audio output exampleGareth Stockwell2010-02-162-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the QIODevice-derived class Generator owns its own internal buffer, it must override bytesAvailable(). Reviewed-by: trustme
| * | | | | | Only use unix-like tools when not building for Symbian in Windows.Miikka Heikkinen2010-02-161-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having sh.exe but not the other unix-like basic tools in the path made distclean break in Windows. Task-number: QTBUG-7883 Reviewed-by: axis
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-16195-210/+18611
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| * | | | | | QLocalSocket::isValid on Windows must check for broken connectionJoerg Bornemann2010-02-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ossi
| * | | | | | fix pipe handle leak in qlocalsocket_win.cppJoerg Bornemann2010-02-162-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroying a QLocalSocket with unwritten data left unclosed handles behind. The connection wasn't closed properly, such that the other end didn't get notified about the connection loss. Task-number: QTBUG-7815 Reviewed-by: ossi
| * | | | | | GraphicsViewBenchmark: Run app in full screen mode on small desktops.Bjørn Erik Nilsen2010-02-161-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We already run in fullscreen if Q_OS_SYMBIAN or Q_WS_MAEMO_5 is defined.
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2010-02-1660-1/+60
| |\ \ \ \ \ \
| | * | | | | | Fix License headers.Jason McDonald2010-02-1660-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | Fix Thai text on Windows 7Eskil Abrahamsen Blomfeldt2010-02-161-2/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Segoe UI, which is the default ui font on Windows 7, contains the glyph for a single character in the thai unicode range. This is thus detected as supporting the Thai script even though it only contains this one character, and as a result all thai text would appear as boxes on Windows 7 unless you changed the font. The patch is a temporary hack to work around the problem until a proper fix can be made. Reviewed-by: Lars Knoll
| * | | | | | QTextCodec::codecForName. Insert in the cache in all cases.Olivier Goffart2010-02-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gabriel
| * | | | | | Prevented calling the pixmap filter implementations with null pixmaps.Samuel Rødal2010-02-151-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Bjørn Erik Nilsen
generated by cgit v0.12 at 2025-08-21 15:20:54 (GMT)