| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| |
| |
| |
| |
| |
| | |
Make a note about alpha channels and QT_NO_DIRECTFB_IMAGEPROVIDER
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
| |
| |
| |
| |
| |
| | |
Add a note about changing top level transparency at runtime.
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
| |
| |
| |
| |
| | |
Reviewed-by: Trust Me
Requested-by: Sales and Legal
|
|\ \
| |/
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
qmake - add targets to wrapper make file
make stub_sis
createpackage - use -s or --stub to run makesis with the -s argument
also copies the file to the right place in epoc32\data\system\installs
qt.iby - add qt_stub.sis and qt_webkit_stub.sis
Task-number: QTBUG-6570
Reviewed-by: Miikka Heikkinen
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add the download URI for smart installer package to documentation
Catch up symbianutils to creator 3efdb87682a5785bac7b90f9f9a8bb819a1cb053
rename trk -> symbianutils
Catch up TRK library to creator f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b
Fixed defect in handling of expose events for Symbian
Added qwidget test case which displays a native child widget
Fix tst_QAbstractItemView::task250754_fontChange and tst_QAbstractItemView::QTBUG6407_extendedSelection for Symbian & 5800
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8068
Reviewed-by: David Boddie
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Tidy the changes file.
Skip the transparent pixels when doing the sourceOver
Refactor comp_func_solid_Clear() and comp_func_solid_Source()
Add mingw-specific expected failures for JS test suite
QNAM HTTP: Forgot to remove a qDebug()
QNAM HTTP: Reserve bytes for HTTP parsing
Add platform-specific expected failures for JS test suite
Skip test that crashes on win32-g++
QNetworkCookie(Jar): fix includes
QNAM HTTP: Improve readHeader() of the HTTP reply
Add QSKIP to functionEntryAndExit_builtin.
QNAM HTTP: Improve parseStatus() of HTTP reply
Demo browser: Better handleUnsupportedContent implementation
demo browser: Fix the way warnings were (not) displayed
doc: Updated deployment OS X requirements for 4.6
|
| | |
| | |
| | |
| | | |
Beginning with Qt 4.6, OS X 103 (Panther) is no longer supported.
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Added make target for creating smart installer packages
- Application sis is automatically generated if missing when
"make installer_sis" is invoked
- No need to specify installer pkg UID if self signing is enough
- Related docs fixed
- Fixed smartinstaller.sis name to be correct
Task-number: QTBUG-8026
Reviewed-by: axis
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| |
| |
| |
| |
| |
| |
| | |
Changed the URL to be version independent.
Task-number: QTBUG-7295
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7683
Reviewed-by: Tom Cooksey
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
|\ \ \ \
| |/ / / |
|
| | |/
| |/|
| | |
| | | |
Reviewed-by: axis
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| |/
| |
| |
| |
| |
| |
| | |
"run" target no longer is just for running emulator targets.
Also added TRK for optional requirements.
Reviewed-by: axis
|
|/
|
|
|
| |
Merge-request: 1627
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
| |
Added the perl requirement for building from source on Windows and
clarified that the support for OpenGL ES Common Lite 1.0 is being
dropped and not for OpenGL ES Common Lite as a whole.
Reviewed-by: Martin Smith
|
| |
|
|\ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added "best practice" page on HW acc for mebedded. Modified HW acc docs. Adding Hello GL ES for Wince to the list of examples.
QTBUG-5791
David Boddie
|
|\ \ \
| |_|/
|/| |
| | | |
4.6-staging2
|
| | |
| | |
| | |
| | | |
Reviewed-by: Gareth Stockwell
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
By Janne Anttila:
- Switched links/references from 'S60' to 'Symbian'
- Added collection page for Symbian specific documentation
- Added page about application deployment for Symbian
- Update supported compiler list for Symbian to more specific one
- Added bullet about dev env. setup to Symbian installation page
- Commented that SBSv2 is not offically supported by current S60 SDKs
- Moved S60 3rd FP1 special patching note after SDK installation bullet
- Recommedation to look into Qt quick start guide from Symbian Forum
- Added Symbian bullet to known issues page and link to wiki
- Added link to "state of support" document from symbian docs main page
By aportale:
- Rephrasing
- More consistent naming of 'Qt for the Symbian platform'
- Implementation of suggestions from other Nokians
Reviewed-By: Janne Anttila
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: Espen Riskedal
Reviewed-by: Frans Englich
|
| | |
| | |
| | |
| | | |
Reviewed-by: Gareth Stockwell
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
By Janne Anttila:
- Switched links/references from 'S60' to 'Symbian'
- Added collection page for Symbian specific documentation
- Added page about application deployment for Symbian
- Update supported compiler list for Symbian to more specific one
- Added bullet about dev env. setup to Symbian installation page
- Commented that SBSv2 is not offically supported by current S60 SDKs
- Moved S60 3rd FP1 special patching note after SDK installation bullet
- Recommedation to look into Qt quick start guide from Symbian Forum
- Added Symbian bullet to known issues page and link to wiki
- Added link to "state of support" document from symbian docs main page
By aportale:
- Rephrasing
- More consistent naming of 'Qt for the Symbian platform'
- Implementation of suggestions from other Nokians
Reviewed-By: Janne Anttila
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reviewed-by: TrustMe
Conflicts:
doc/src/platforms/symbian-support.qdoc
Something went wrong with the cherry-picks, spotted by Jason.
Conflicting cherry-pick of 9a4995711746103286ea3fb9cc576e133fd29e4e.
|
|\ \ |
|
| | | |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-5764
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-5764
|
|\ \ \
| | |/
| |/| |
|
| |\ \
| | | |
| | | |
| | | | |
4.6-staging2
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Espen Riskedal
|
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The content was compiled primarily by asking the members of the S60
team.
Reviewed-by: David Boddie
|