| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
`sources.path += qmediaplayer.pro'
where `sources.files += qmediaplayer.pro' was intended.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There new Qml demos are self-contained Qml applications,
ready to be run on Symbian devices:
qmlcalculator qmlclocks qmldialcontrol qmleasing
qmlflickr qmlphotoviewer qmltwitter
Since these depend on the DEPLOYMENT feature of qmake,
they currently will only work for Symbian and theoretically
WinCE/Mobile. TODO: create INSTALLS rules in order to support
more platforms.
Task-number: QTBUG-10148
Reviewed-By: axis
|
|
|
|
| |
Now with fewer warnings! Also, the stop button works.
|
|
|
|
| |
Zooming out no longer zooms to smaller than the window size.
|
|\
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Some tweaks on the QML-enhanced QtDemo
|
| |
| |
| |
| |
| |
| | |
-don't crash if we aren't showing the FPS
-different method of unloading the QML example when hidden
-fix screwed up background when scaled.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
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.
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Added some changes for 4.6.3
Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
Allow auto-test to compile when using namespaces
Fix regression in QVarLengthArray::operator=
Removed unnecessary PlatSec capabilities from spectrum demo DLL
Make test work with shadow builds again.
Added missing PlatSec capabilities to spectrum demo DLL
My 4.6.3 changes
Tidy changes file for 4.6.3.
My 4.6.3 changes
My 4.6.3 changes
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Build fix for spectrum demo when -qtnamespace is used
Fixed license headers in spectrum demo
Qt app draws background incorrectly when animated wallpaper is used
Don't use QAtomicInt in statics because they are non-POD.
QTBUG-5955: Qt fails to build on alpha architecture
|
| |\ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On Symbian, spectrum.exe has UserEnvironment capability in order to
allow it to use QAudioInput. This means that the capabilities of
any DLL which it loads must include UserEnvironment. Prior to this
patch, fftreal.dll was built without any capabilities, causing
startup of the application to fail.
Although granting only UserEnvironment to fftreal.dll would fix the
bug, the usual pattern on Symbian OS is to grant 'all -tcb'
capabilities to DLLs. The capabilities with which the DLL actually
runs are inherited from its parent process.
Task-number: QTBUG-10964
Reviewed-by: Liang Qi
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-10881
Reviewed-by: Liang Qi
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Jason McDonald
Task-number: QTBUG-10887
|
|\ \ \ \ \
| |/ / / / |
|
| |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | | |
Conflicts:
doc/src/declarative/advtutorial.qdoc
|
| | | | |
| | | | |
| | | | |
| | | | | |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
...
|
| | |\ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits)
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.
Fixing incorrect addition of public API symbols.
Removal erroneous inclusion of new Public API in qmacstyle.
Doc: design changes
qdoc: Fixed html error, but the problem is still there.
qdoc: Changed number of columns to 1. Oila!
Doc: Changes to the HTMLGenerator, style and js
remove dead code that will never get called.
add bytes and activeTime to corelwan.
Fix formating of license header.
fix irix build
clarify wording of warning message
...
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/gui/styles/qmacstyle_mac.mm
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (22 commits)
Fix formating of license header.
fix irix build
clarify wording of warning message
close scope while inside assignment only if the last char is a closing brace
deprecate undocumented -E option
use qtPrepareTool for qdoc
unify QMAKE_QMAKE path separator fixing
simplify arcane conditional, once again
qdoc: Propagate the language information into the XML as before.
Removed a change from the 4.7.0 change log.
Improve look and feel of itemviews on mac
doc: Fixed many broken links.
doc: Fixed many broken links.
update 4.7.0 changes
QPushButton's click area exceeds the button area by far on Mac OS X
QApplication::closeAllWindows() should ignore windows being closed
Examples: Fix compilation with namespace.
Use QApplication::arguments() to check for command line args
Added support for .rc files on VS2010.
Doc: Updating CSS and JS
...
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Use the Qt way to look up command line args, remove 5 lines of code per
example. Also clean up badly indented code.
|
| |_|_|_|_|/ /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Make the UX more controlled from QML, and tweak the frame to be better.
Blur mechanism has been reworked, but still disabled by default.
|
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Doc fixes, improvements
Allow js files with '.pragma library' to be used from WorkerScript
Add more examples of XPath expressions to XmlRole.
Open input panel on press if TextInput or TextEdit are already focused but panel has been closed
Fix horizontal/verticalCenter anchors bug.
Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".
Fix for qml reloaded in qml viewer not being maximized properly on a device
Unify naming of import plugin targets
Add a way to control when software input panels are shown in TextInput and TextEdit elements
Replace QTime with QElapsedTimer
Fix Gradient doc snippet.
|
| |\ \ \ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-10834
Reviewed-by: Warwick Allison
|
| |/ / / / / / |
|
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (22 commits)
Fix compilation of qegl.cpp after the last merge
Fix a race condition with QtDBus blocking for replies.
QtDBus: Debug message update
Removed DEPLOYMENT from demos/spectrum/spectrum.pro
Install source for spectrum demo
Fixed path for copying launcher script for spectrum demo
My 4.6.3 changes.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f )
Fixed an assert in QMenu
Backport multitouch bug fixes to 4.6
tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
Call eglTerminate() when the last QEglContext is destroyed to free mem.
Removed double EINTR loop from nativeWrite and nativeRead.
Fixed qsslkey test deployment for Symbian and fixed compiler warnings.
Fixing the race condition in event dispatcher implementation on
changes-4.6.3 updated
Fixing the compile issue.
Fixing the compile issue.
Typo.
Removed nearest test from qaudiodeviceinfo unit test.
...
|
| |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | /
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
DEPLOYMENT was added to demos/spectrum/spectrum.pro as a workaround
for QTBUG-5312, in order to allow 'make sis' to be executed from
the demos/spectrum directory. While this workaround is OK for SBSv2,
it causes a build failure when using SBSv1.
Task-number: QTBUG-10833
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-10880
Reviewed-by: Thomas Zander
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-10879
Reviewed-by: Thomas Zander
|
| | | | | | |
|
|/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Includes minor changes and additions to the existing doc and examples,
so that they follow Qt conventions better.
Note that while blurring the background was part of the plan for the
embedded QML viewer I could not get it to perform well enough. In the
future, when blur is fast enough (or someone else can get it to
perform better than I) -use-blur should become the default, and
-no-blur the option.
Task-number: QTBUG-10582
|
|\ \ \ \ \
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix FolderListModel parentFolder property's file drive handling
Add license headers for .qml files.
Also show file/line numbers on XML query errors.
Print warnings for xml query syntax errors
Clean up
Add XmlListModel::get()
|
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
Examples get the BSD license, while all other .qml files get the
LGPL/tech-preview license.
Reviewed-by: Trust Me
|
|/ / /
| | |
| | |
| | | |
Reviewed-by: trustme
|
| |/
|/|
| |
| |
| |
| | |
-dial moved to dial-example so the dirname is the same as the qml name
-added rssnews to .pro so it can be installed
-added some README files like the other dirs
|
| |
| |
| |
| | |
QDeclarativeComponent)
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits)
Search for QML import libraries also in application directory
Doc improvements
Disable mouse-based selection in TextInput/TextEdit
Rename qml executable to qmlviewer
Don't crash if the target parent is destroyed.
Introduce a threaded interpreter for QML binding bytecode
Bug moved.
doc
doc
Remove image example (covered in class docs)
When changing Loader source, remove old item from scene immediately.
Add missing .qmlproject files
Fix folderlistmodel with qt namespace
Renaming "Qml Launcher" back to "QML Viewer"
Rename some examples: proxyviewer -> networkaccessmanagerfactory,
Regression fix for Loader anchors not working
Make Qt.include() work for js files that have '.pragma library'
doc fix
Improve docs for Qt.quit()
Prevent assignment of values (string, number, bool) to signal handlers.
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (36 commits)
Doc improvements
Disable mouse-based selection in TextInput/TextEdit
Rename qml executable to qmlviewer
Don't crash if the target parent is destroyed.
Introduce a threaded interpreter for QML binding bytecode
Bug moved.
doc
doc
Remove image example (covered in class docs)
When changing Loader source, remove old item from scene immediately.
Add missing .qmlproject files
Fix folderlistmodel with qt namespace
Renaming "Qml Launcher" back to "QML Viewer"
Rename some examples: proxyviewer -> networkaccessmanagerfactory,
Regression fix for Loader anchors not working
Make Qt.include() work for js files that have '.pragma library'
doc fix
Improve docs for Qt.quit()
Prevent assignment of values (string, number, bool) to signal handlers.
Make sure strings are escaped when returned via asScript.
...
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qapplication_s60.cpp
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
removed test file, part of mediaservice removal.
Rebuild configure.exe
Rebuild configure following the removal of media services.
More mediaservices removal work.
Removed mediaservices.
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure.exe
src/imports/multimedia/qdeclarativeaudio.cpp
src/imports/multimedia/qdeclarativeaudio_p.h
src/multimedia/mediaservices/mediaservices.pro
src/plugins/mediaservices/mediaservices.pro
src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h
src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h
src/s60installs/s60installs.pro
src/src.pro
|