summaryrefslogtreecommitdiffstats
path: root/src/s60installs
Commit message (Collapse)AuthorAgeFilesLines
* Symbian: fix symbian deffilesPasi Pentikainen2012-04-264-5/+8
| | | | | | | | | | | Absent removed and freeze added exports caused by change If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2 "Moved qmljs_debug_arguments to QCoreApplication" (commit 8599a0e6397391634ee52197e164f6b7121f9a4d). Change-Id: I6974d1f38c233b2143fe2e4e59b730b2bab475dc Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Symbian: absent changed exports in symbian def-filesPasi Pentikainen2012-04-182-2/+2
| | | | | | | | | Absent the exports changed by b84e033f2e77d108da413c00ee3d9f1636e8ad5b to enable symbian building. Change-Id: Ie3d715eea5ec2e955633ecfe019cb7fcaed9377d Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Symbian: absent changed exports in symbian def-filesPasi Pentikainen2012-04-181-227/+227
| | | | | | | | | Absent the exports deprecated by ed881474111d635bb90d3e08e9fb70c06d19d48b to enable symbian building. Change-Id: I775d0159743d7d61866d910eefa9a0f807c7feff Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Symbian: drop OpenGL ES in non-supported hardwarePasi Pentikainen2012-03-231-0/+3
| | | | | | | | | | When hardware configuration has no OpenGL ES 2 support indicated, leave OpenGL ES out of Qt compilation alltogether. Task-number: ou1cimx1#987609 Change-Id: If43a8de059596fbdb52c97535436c441760c97ab Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com> Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
* Avoiding early deleteLater in Symbian with better loopLevel trackingMurray Read2012-02-092-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | There have been a number of app crashes where deleteLater has been triggering too early, causing an object to be deleted before it has been finished with. This was happening when deleteLater was issued then Symbian's active scheduler loop was nested. Qt keeps track of loop nesting level to implement deleteLater correctly, but it was only tracking the event loop in processEvents and QEventLoop correctly. The wakeup and timer active objects were assuming they were always run from processEvents and its round robin active scheduler and were adjusting the loop level to account for this. However if they happened to run in another event loop, eg the active scheduler, the loop level adjustment meant that it looked like the event loop was re-running at the same level, which allowed deleteLater to act. The fix is to mark active objects as being run from the RR scheduler, then the wakeup and timer active objects can be tested to see which type of scheduler they are actually running in. With this knowledge, the correct loop level adjustment can be made, and deleteLater runs at the correct time. Task-number: ou1cimx1#947013 Change-Id: Id05cd63ad10e100ea807cc276844aaa36c614351 Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Symbian: absent removed exports in symbian def-filesPasi Pentikainen2012-01-311-3/+3
| | | | | | | Changes some missing exports to absent in def-files to fix build break. Change-Id: I2737dd9f2f636f02a3a7645a4a3a184667e8b572 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Symbian: absent removed exports in symbian def-filesPasi Pentikainen2012-01-302-14/+14
| | | | | | | | Changes exports to absent in def-files to fix build break. Change-Id: I0f0167c261911a23017042541d95855fcfd50cd9 Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Symbian - add rom upgrade flag to Qt sis filesShane Kearns2012-01-261-1/+2
| | | | | | | | | | | | The rom upgrade flag allows the sis file to be installed if there is already a version of the dll in rom. The flag is silently ignored unless the sis file is properly signed with a certificate trusted for this purpose. This change saves developers needing to edit pkg files after running qmake. Change-Id: I0914734c951ea1f0d1c48b169bee0b022bc9e275 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Add a public API for releasing cached GPU resources on SymbianGareth Stockwell2012-01-252-0/+2
| | | | | | | | Task-number: ou1cimx1yyy964181 Change-Id: I2f24d1d0f988bfe029e24fd29d59e6421301b670 Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix for player application exit crashSatyam Bandarapu2012-01-132-0/+2
| | | | | | | | | | | | | | | | Crash is a regression from the commit 7cd29ef169b94b0182b4207b37715f7427e4e4d6. The commit 7cd29ef169b94b0182b4207b37715f7427e4e4d6 creates two fep contexts, another one is created while first one being created. When application exit, other fep context is deleted after coeEnv destroyed. Fep context destructor uses method from coeEnv and when second fep Context deleted application crashes. To fix the crash, flaged fep context creation while being created. Change-Id: I3079179df2c3a59a0117d5de775116e06d7e3cff Reviewed-by: Satyam Bandarapu <ext-satyam.bandarapu@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Revert "Fix memory leaks in OpenVG and OpenGL resource pools"mread2011-12-122-2/+2
| | | | | | | | | | | | This reverts commit 8752faf0564bed86396b01529dc8ef5064150f4c. Also Revert "Fix def files" This reverts commit d2a3b9ee8c9329cac96b5e509df0e6a69dbef91c. This was found to cause a crash in QMLGallery app. It is not necessary to delete these resource pools at app exit, as the OS should automatically release the resources at this point. Reviewed-by: Jani Hautakangas
* Merge remote-tracking branch 'qt/4.8'Pasi Pentikainen2011-12-061-0/+0
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-0510-3/+32
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Correct client rect calculation for MCL Symbian: Fix CBA display on application with multiple windows Fix def files doc - document symbian behaviour of QFile::link Symbian - prefer sessions started by this process to choose proxy Freezing Def files in Qt Lightmaps demo Symbian fix CBA comes on top of option menu Fix memory leaks in OpenVG and OpenGL resource pools Fix sqlite driver memory eating due to close failure
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-301-227/+227
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix Symbian def-file
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-11-291-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Set execution bits for more scripts. Set execution bits for .test files. Fix more permissions (no execute bit). Fix permission (no execute bit). QGraphicsLayoutItem - bound constraint the minimum and maximum size Notify X11 of its resizable state through MWM Hints.
| | * | | Fix permission (no execute bit).Frederik Gladhorn2011-11-221-0/+0
| | | | |
* | | | | symbian - don't export qsymbianbearer.qtplugin twiceShane Kearns2011-12-021-3/+3
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file was being exported using both prj_exports and deployment lines. As deployment is copying to epoc32 z and c directories, the prj_exports is not needed. Moved the prj_exports rules into the S60 5.0 section, where deployment is not used but rather explicit rules added to the sis file. Task-number: ou1cimx1#946574 Reviewed-by: mread
* | | | Fix def filesJani Hautakangas2011-12-012-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
* | | | Symbian - prefer sessions started by this process to choose proxyShane Kearns2011-11-302-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When WLAN and 3G connections are both active, the proxy for the wrong connection may have been chosen in the case of plain sockets or QNetworkAccessManager with an invalid configuration. When enumarating active connections to choose a proxy, prefer a connection that was opened by this process. Task-number: QTBUG-22615 Task-number: ou1cimx1#930701 Reviewed-by: mread
* | | | Freezing Def files in QtSatyam Bandarapu2011-11-308-1/+24
| |_|/ |/| | | | | | | | | | | | | | Adding unfrozen exports to def files in Qt Reviewed-by: mread
* | | Fix Symbian def-filePasi Pentikainen2011-11-291-227/+227
|/ / | | | | | | | | | | | | Fix the Symbain bwins def-file QtGuiu.def to include changes caused by commit 6b6397f91125ddfc2abdea9704bbed08beb22ab7. Reviewed-by: Murray Read
* / New API to set AVKON flag to inputcontext in Qt/Symbian.Satyam Bandarapu2011-11-252-0/+2
|/ | | | | | | | | | This API is to pass any AVKON FEP flag to QCoeFepInputContext. Implemented as an exported private API, which is available only in Qt/Symbian. If latin keyboard flag is passed to this API and editor is Email/Url, virtual keyboard launches always with latin characters regardless of input language. Reviewed by: Sami Merila
* WINSCW def file update so that qtgui can pick up virtual from qtcoremread2011-11-091-2/+3
| | | | | | | | QtGui needs the QEventDispatcherSymbian::reactivateDeferredActiveObjects virtual to be exported from QtCore Task-number: QTTH-1494 Reviewed-by: Shane Kearns
* Preventing zero-timer lockups when Symbian's active scheduler usedmread2011-11-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | Qt 4.7 had a deferred active object scheme to give Qt active objects some round robin behaviour with Symbian's active scheduler. Qt 4.8 has a round robin active scheduler which removed the need for any special support in Qt's active objects. Except it has been discovered that sometimes Symbian's active scheduler is used, and if Qt's zero-timer active objects are running at the time, they can prevent any other active objects from running in Symbian's scheduler, which can cause lockups. This change re-introduces the deferred active object system for Qt timer active objects. This means that a timer active object will only run once per processEvents() call when Symbian's active scheduler is used. Qt's round robin active scheduler already prevents an active object running more than once per processEvents(), so this change does not affect the normal case of using Qt's round robin scheduler. Task-number: QTTH-1494 Reviewed-by: Shane Kearns
* Correct faulty 4.7->4.8 merge of Symbian def-filesLiang Qi2011-11-012-1482/+1473
| | | | | Done-with: Pasi Pentikainen Reviewed-by: Jani Hautakangas
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-252-0/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qeventdispatcher_symbian.cpp src/declarative/qml/qdeclarativetypeloader.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/opengl/qgl.cpp src/opengl/qgl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qclipboard/test/test.pro tests/auto/qsound/qsound.pro
| * Update def filesJani Hautakangas2011-10-182-8/+9
| | | | | | | | Reviewed-by: TRUSTME
| * Add new signals to indicate GPU resource usage.Jani Hautakangas2011-10-141-0/+7
| | | | | | | | | | | | | | | | | | QML elements that use GPU resources directly needs to know when Qt releases GPU resources and when they are available again. Task-number: QT-5310 Reviewed-by: Samuel Rødal
* | QtGui def file updatemread2011-10-142-0/+6
| | | | | | | | | | | | | | | | For the addition of QApplicationPrivate::symbianHandleLiteModeStartup. Two other unfrozen functions also added. Task-number: QT-4933 Reviewed-by: TrustMe
* | Put Qt translation files to rom on Symbian.Pasi Pentikainen2011-10-132-0/+12
| | | | | | | | | | Task-Number: QTBUG-4919 Reviewed-by: Honglei Zhang
* | Added new private exports to DEF filesmread2011-09-282-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This change lists new private exports in the Symbian def files for: - QCoreApplicationPrivate::rebuildInstallLibraryPaths - QFactoryLoader::updateDir There are also some QFutureWatcherBase exports added to the winscw DEF file which appear to have not been added before. Task-number: QTBUG-20098 Reviewed-by: Shane Kearns
* | Merge remote branch 'qt/4.8'Shane Kearns2011-09-072-2/+2
|\ \
| * | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-09-012-2/+2
| |\|
| | * DEF file updateGareth Stockwell2011-08-312-2/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Fix QtCore winscw def-fileTomi Vihria2011-08-311-1/+1
| | | | | | | | | | | | | | | | | | Un-absented QXmlStreamAttributes constructor from the def file Reviewed-by: TrustMe
* | | Append missing export to GtGui def files for SymbianTomi Vihria2011-08-312-0/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Freeze and re-enable def files for SymbianTomi Vihria2011-08-3122-3043/+2946
|/ / | | | | | | | | Task-number: QT-5158 Reviewed-by: Sami Merila
* | Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.Miikka Heikkinen2011-08-241-3/+6
| | | | | | | | | | | | Task-number: QTBUG-10432 Rubber-stamped-by: ossi Reviewed-by: TrustMe
* | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-231-3/+3
|\ \
| * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-151-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/fancybrowser.pro src/3rdparty/libpng/ANNOUNCE src/3rdparty/libpng/CHANGES src/3rdparty/libpng/CMakeLists.txt src/3rdparty/libpng/LICENSE src/3rdparty/libpng/README src/3rdparty/libpng/configure.ac src/3rdparty/libpng/example.c src/3rdparty/libpng/libpng-manual.txt src/3rdparty/libpng/libpng.3 src/3rdparty/libpng/libpngpf.3 src/3rdparty/libpng/png.5 src/3rdparty/libpng/png.c src/3rdparty/libpng/png.h src/3rdparty/libpng/pngconf.h src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pnginfo.h src/3rdparty/libpng/pnglibconf.h src/3rdparty/libpng/pngmem.c src/3rdparty/libpng/pngpread.c src/3rdparty/libpng/pngpriv.h src/3rdparty/libpng/pngread.c src/3rdparty/libpng/pngrtran.c src/3rdparty/libpng/pngrutil.c src/3rdparty/libpng/pngset.c src/3rdparty/libpng/pngstruct.h src/3rdparty/libpng/pngtest.c src/3rdparty/libpng/pngtrans.c src/3rdparty/libpng/pngvalid.c src/3rdparty/libpng/pngwrite.c src/3rdparty/libpng/pngwtran.c src/3rdparty/libpng/pngwutil.c src/gui/dialogs/qfiledialog_symbian.cpp src/gui/kernel/qsoftkeymanager.cpp src/s60installs/s60installs.pro
| | * Fix installation on S60 5.0Shane Kearns2011-08-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | A case change broke the case sensitive comparison of UIDs to check if the package being built was Qt itself - this caused a recursive dependency in the sis file. Task-number: QTBUG-20742 Reviewed-by: Miikka Heikkinen
| | * Backporting fix for QTBUG-18716Tomi Vihria2011-07-112-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide internal API to avoid automatic translation of input widget There will be cases when client will want to disable splitview automatic view translation, so that keyboard is just brought on top of the application and no other actions happen. There will be no new public Qt GUI API to cover the cases (the public API will come from QML Components), but the implementation is done with new private API. Task-number: QTBUG-20171 Reviewed-by: Honglei Zhang
* | | DEF file freezemread2011-08-048-0/+102
|/ / | | | | | | Reviewed-by: Miikka Heikkinen
* | Eabi DEF file sync between Qt 4.7 and 4.8mread2011-07-217-72/+80
| | | | | | | | | | | | | | | | | | New functions have been added to both Qt 4.7 and 4.8, but they have ended up at different ordinal positions in the DEF files. This change corrects that so that a function in 4.7 will be at the same position in 4.8. Reviewed-by: Honglei Zhang
* | Winscw DEF file sync between Qt 4.7 and 4.8mread2011-07-217-370/+380
| | | | | | | | | | | | | | | | | | The Qt 4.7 def files have had some new exports added over time. These have also been added to the Qt 4.8 def files, but at different locations. Cases where these are not just ABSENT exports are now synchronised for winscw. Reviewed-by: Honglei Zhang
* | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-051-4/+8
|\| | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc src/gui/text/qtextlayout.cpp src/opengl/qwindowsurface_gl.cpp
| * The qmlshadersplugin deployment must be scoped same as its buildingMiikka Heikkinen2011-06-301-4/+8
| | | | | | | | | | | | | | | | | | The check "contains(QT_CONFIG, opengl)" is used to include shaders subdir, so the same check needs to be used when defining deployment for shaders in s60installs.pro Task-number: QTBUG-20192 Reviewed-by: TrustMe
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-07-041-10/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fixing winscw def file broken by recent merge runonphone: Change the upload option to allow uploading any file runonphone: Include the manufacturer name in the friendly name on OS X runonphone: Fix usb device enumeration on Mac OS X
| * | Fixing winscw def file broken by recent mergemread2011-06-271-10/+8
| | | | | | | | | | | | | | | | | | | | | QtGui's def file had duplicated lines and a gap in the ordinal sequence. Reviewed-by: Shane Kearns
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-011-7/+10
|\ \ \ | |/ / |/| / | |/ | | Conflicts: src/s60installs/s60installs.pro
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 23:44:06 +0000