| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Resolving UID clash with other example apps
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 19ee05c994af7d0c55ec9e4a44e7e485eafc8c66)
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix location of QtMultimedia def files
Freeze 4.7 def files on top of 4.6.3
Update def files for 4.6.3
Add runtime_graphics_system flag to QApplicationPrivate.
Add missign license headers.
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Make link on linux/symbian
Fix double slashes on few data caging paths
Fix for QRuntimePixmapData serial number setting.
Enable QTouchEvent for S60 5.0
Add missing license header.
Fix build error on S60 3.1 environments
QRuntimeGraphicsSystem
Fix replacement functions in platform_paths.prf
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/plugins/bearer/symbian/qnetworksession_impl.h
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/kernel/qapplication_s60.cpp
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On systems where libs don't automagically go to the system dirs we need
to add the build dir for using the lib.
|
|\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
demos/spectrum/app/engine.h
demos/spectrum/app/mainwidget.h
demos/spectrum/app/settingsdialog.h
demos/spectrum/app/spectrograph.h
demos/spectrum/app/spectrumanalyser.h
demos/spectrum/app/tonegenerator.h
demos/spectrum/app/tonegeneratordialog.h
demos/spectrum/app/utils.h
demos/spectrum/app/waveform.h
tests/auto/qtextcodec/tst_qtextcodec.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10964
Reviewed-by: Miikka Heikkinen
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10881
Reviewed-by: Liang Qi
|
| | |/
| |/|
| | |
| | |
| | | |
Reviewed-by: Jason McDonald
Task-number: QTBUG-10887
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits)
Dont crash when assigning the same input context twice.
Fixed a typo in variable name in qlocale data generator.
Fix for Norwegian and Korean languages on symbian.
Remove unused function in QDBusConnectionPrivate
Doc: Fixing bugs in HTML generator
Updating 4.7.0 change log.
Doc: Correcting style to class lists
qdoc: Improved class index page.
Added MSVC 2010 project files to .gitignore
Fix architecture detection on GNU/Hurd.
Revert "tst_bic: make it possible to test for cross-compilation"
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
...
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/gui/styles/qmacstyle_mac.mm
|
| | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| |/ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-10880
Reviewed-by: Thomas Zander
|
|/
|
|
|
| |
Task-number: QTBUG-10879
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
|
| |
Compiler was failing to disambiguate the following overloads:
pow(double, double)
pow(float, float)
Reviewed-by: mread
|
|
|
|
|
|
|
|
| |
- Added /3rdparty/ to directory path for FFTReal code
- Added missing $QT_BEGIN_LICENSE$, $QT_END_LICENSE$
- Fixed incorrect license in app/wavfile.cpp
Reviewed-by: trustme
|
|
This application is a demo which uses the QtMultimedia APIs to
capture and play back PCM audio. While either recording or playback
is ongoing, the application performs real-time level and frequency
spectrum analysis.
Reviewed-by: Alessandro Portale
|