| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
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:
doc/src/getting-started/installation.qdoc
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tools/assistant/lib/qhelpsearchquerywidget.cpp
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |\ \ \
| | | |/
| | |/| |
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Workaround for compiler error with MWCC (Symbian emulator)
Describe patch-capabilities in the install instructions.
Remove qmake warning by using appropriate variable.
Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has changed /epoc32/include layout, including a subdirectory called "platform".
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number:QTBUG-7294
Reviewed-by:Gareth Stockwell
|
| | |/
| | |
| | |
| | | |
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
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | | |
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
|
| | |/
| | |
| | |
| | |
| | | |
Task-number: QTBUG-6348
Reviewed-by: Janne Koskinen
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| | |\ |
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | | |/
| | |/|
| | | |
| | | |
| | | | |
Task-number: QTBUG-6574
Reviewed-by: Trust Me
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/getting-started/known-issues.qdoc
src/script/qscriptextqobject.cpp
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/global/qglobal.h
src/gui/dialogs/qfiledialog_win.cpp
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-6211
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | | |
|
| | |\ \
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-6175
Reviewed-by: TrustMe
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: added part of Andy's update.
Fix the tablet device recognition on Windows
Fix S60 input method not showing up in editable QGraphicsTextItems
|
| | | | |
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/modules.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/webkit/fancybrowser/mainwindow.cpp
src/gui/widgets/qtabbar.cpp
src/gui/widgets/qtabbar_p.h
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/tabbedbrowser.cpp
translations/translations.pri
|
| |\ \ \
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
WebKit will not build unless the mentioned variable is set.
RevBy: Aleksandar Sasha Babic
|
| |\ \ \
| | |/ / |
|
| | |\ \ |
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | |/ / / |
|
| | | | |
| | | | |
| | | | |
| | | | | |
initialization process creating window handles.
|
| |\ \ \ \
| | |/ / / |
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | | |
RevBy: Trust me
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QT-1521
Acked-by: Thierry Bastian
|
| |/ /
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QT-2455
Reviewed-by: David Boddie
|