| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/htmlgenerator.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (25 commits)
qdoc3: Updates to qdoc to print error message in ALL CAPS
Doc: Added a note to Code Editor example docs
Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docs
Doc: Added a link in Symbian Intro to Required Capabilities
Doc: Added info on ordered targets for VS to qmake manual
Doc: Small addition to the QML anchor layout docs
Doc: Internalized QDeclarativeTypeLoader
Doc: Said that QIODevice::isSequential returns false by default
Doc: Said that QList::clear deallocates memory
Doc: Updated platform notes for MultiMedia and Phonon
Doc: Added links to the plugin deployment guide.
Doc: Fix doc bug in QMouseEvent
Doc: Fixed doc bug in QMetaObject
Doc: Fixed date format doc bug in QDateTime/Qt namespace
Doc: Removed internal Phonon classes from doce
qdoc3: Updates for QTBUG-20776; include fileToOpen path.
qdoc3: Updates for QTBUG-20776; clear map between runs.
qdoc3: Updates for QTBUG-20739 (no read-only for QML components)
qdoc3: Updates for QTBUG-20776 and QTBUG-20777
qdoc: Check pointer for null before dereferencing.
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/node.cpp
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
tools/qdoc3/generator.h
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
|
| | | |\ \ \ |
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-19744
Reviewed-by: David Boddie
|
| | | | |\ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-20673
|
| | | | |/ / / /
| | | |/| | | | |
|
| | |\ \ \ \ \ \
| | | | |_|_|/ /
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/generator.h
tools/qdoc3/htmlgenerator.cpp
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-9004
Reviewed-by: David Boddie
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-9440
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-8942
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-11988
Reviewed-by: David Boddie
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-15514
Reviewed-by: David Boddie
|
| | | | | | | | |
|
| | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/network/ssl/qsslcertificate.cpp
|
| |\ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix Symbian system date format parsing.
Fix QXmlSimpleReader auto test failer
Fix pointer event mapping when windows are fixed to native orientation
Fix incorrect Symbian version check.
Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.
Improved support for shadow builds in Symbian.
Fix def file paths for Symbian shadow builds
Giving QUuid::createUuid() more entropy on Symbian
Enable running of XQuery test suite
QXmlSimpleReader handle external entity reference file over 1k
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
It is now possible to make shadow builds in Symbian.
Note that any relative host side paths specified via BLD_INF_RULES,
MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted
to point to build directory.
Task-number: QTBUG-10432
Rubber-stamped-by: ossi
Reviewed-by: TrustMe
|
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
tools/qdoc3/cppcodemarker.cpp
|
| | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Default graphics memory quota for Symbian applications
Fix warning about missing qs60keycapture_p.h header in gui
Reimplement MR1271 over coda patch
Fixed Symbian memory leak in utcToLocal(QDate &, QTime &)
Fix bad merge on a couple of xml examples
DEF file freeze
|
| | | |\ \ \ \ \ \
| | | | |/ / / / / |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The graphics memory quota, which is a new feature in S60 5.4, now gets
default value of 24MB. User can override the default value using
RSS_RULES:
RSS_RULES += "graphics_memory=<# of kB>;"
Task-number: QT-4963
Reviewed-by: Sami Merila
|
| | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed use of deleted object in XmlPatterns EvaluationCache
Crash when creating scroll bar skin graphics on S60 (debug only)
QS60Style omits drawing theme background in some Symbian SDKs
Fix for qml1shaderplugin GPU resource handling on Symbian
Make it easier to select words at the start of a line.
Doc: Fixing typo
In landscape mode QComboboBox popup can not be showed completely
Fix left alignment of native RTL pre-edit text.
|
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / / |
|
| | |\ \ \ \ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (21 commits)
Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus"
Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter
Fix problem with grabWindow on Mac OS X 10.6 with Cocoa
Added an additional check to workaround an issue on Windows.
don't crash when destroying children
Fix compile issue with Mac OS X 10.5
Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus
Exact word bubble doesn't disappear when screen is tapped (fix part 2)
Fix QPixmap::grabWindow() on Mac OS X Lion
Update 4.7.4 changes
Exact word bubble doesn't disappear when screen is tapped
Make text rendering working outside the gui thread on Symbian.
Doc: Clarified the range of return values from QLineF::angle().
Doc: Fixed \since declarations.
Doc: Standardized on QtQuick for \since declarations.
Doc: Removed whitespace.
Modified \since command behavior slightly to handle project and version.
Doc: Added a simple introduction to Qt and fixed links.
Doc: Added more appropriate links to help reduce confusion.
Doc: Removed non-ASCII characters from the documentation.
...
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix non-ascii name issues in ICD.
Compile fix for Symbian 5th and earlier
fix copying webkit guide under windows
Symbian: Fix backspace on empty lines of multiline textedits
|
| | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|/ /
| | | |/| | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Improved comment finding code.
Added language information to the pure documentation parser.
Doc: Fixes to Qt tutorial
Fixed external link to DevNet Wiki.
qdoc: Fixed a crash caused by accessing a null pointer.
Doc: Fixed the example of an encoded URL in the class description.
Doc: Added a copy of the online style images for the qdoc manual.
Doc: Removed the Google Analytics script.
|
| | | |\ \ \ \ \ \ \ \
| | | | | |_|_|/ / / /
| | | | |/| | | | | /
| | | | |_|_|_|_|_|/
| | | |/| | | | | | |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Jerome Pasion
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
test: Fix `tst_qfiledialog' in a namespaced build
Fix files that don't end with a newline character
tests: Skip `qaudioinput' tests if there is no audio backend available
tests: fixed crash of tst_qdialog
tests: fixed crash of tst_qdialog
Fix QString compares to ""
Add test case name and drop parentheses for -datatags option.
Adding QTDIR validation in tst_symbols autotest
Disabled benchmarks referring to private headers.
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
Add license header to printdatatags autotests
Compile on symbian^3
Compile on Symbian^3.
Added -datatags option to QTestLib
Fixed failure of tst_qxmlquery::evaluateToReceiver
|
| | | |\ \ \ \ \ \ \ \ |
|
| | | | | |/ / / / / /
| | | | |/| | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
These are cosmetic changes to files that do not end
with a newline character.
Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a
Reviewed-by: Rohan McGovern
|
| | |/ / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Add reference to tutorial on setting source file for QDeclarativeView.
Make use of compiled example code that demonstrate using Qt Resources in
calls to QDeclarativeView::setSource() .
Task-number: QTBUG-20985
Reviewed-by: Alan Alpert
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Fixes: QTWEBSITE-272
Reviewed-By: Trust Me
|
| |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Daniel Molkentin
|
|\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|/ / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
doc/src/index.qdoc
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
(cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751)
Reapplied after bad v4.7.4 merge
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
(cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d)
Reapplied after bad v4.7.4 merge
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
(cherry picked from commit 1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4)
Reapplied after bad v4.7.4 merge
|
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
| | | | | | / / /
| |_|_|_|_|/ / /
|/| | | | | | |
| | | | | | | | |
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
|
|\ \ \ \ \ \ \ \
| |_|_|_|_|/ / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/index.qdoc
|
| |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Clarified the range of return values from QLineF::angle().
Doc: Fixed \since declarations.
Doc: Standardized on QtQuick for \since declarations.
Doc: Removed whitespace.
Modified \since command behavior slightly to handle project and version.
Doc: Added a simple introduction to Qt and fixed links.
Doc: Added more appropriate links to help reduce confusion.
Doc: Removed non-ASCII characters from the documentation.
qdoc: Fixed QTBUG-19338
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|