| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Do not unconditionally use pkg-config in .pro files
Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4b
Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007
Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59
|
| |\
|/ / |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (246 commits)
Do not unconditionally use pkg-config in .pro files
Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4b
Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007
Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59
uikit: update SDK setting for the simulator
Add option to compare to different platform in lancelot autotest
uikit: Use release Qt for simulator, update README
Automatic closing of input panel on uikit when QML item looses focus.
Fixed compile error in qwindowsurface_qws.cpp.
Fixed regression introduced by 5842d19cf3dff37a85c.
Remove DerivedSources.pro from WebKit.
Support debuggable in the makefile build system
QLabel documentation: add warning about sanitizing input
runonphone: fix failure to terminate
Fix license headers in new files from coda patch
runonphone: command line args improperly passed to TRK after CODA patch
Mark all Symbian debug binaries debuggable by default
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Using the first pkg-config in PATH is prone to errors when
cross compiling. This is a known issue, and `configure' already
avoids using pkg-config for cross compiling (unless -force-pkg-config is
used). However, there was previously no way for a .pro file to test
whether or not the user had passed -force-pkg-config.
Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it
is safe to run pkg-config.
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
This time also including WebKitLibraries/*.a, needed for the
Mac build.
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
This time including webkit/include/ files generated on a Mac
(thanks to Alexis Menard).
|
| | |
| | |
| | |
| | | |
Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (31 commits)
changelog
Compile with DEBUG_FONTENGINE define
minor optimization
remove the old compatibility code
make QFontEngineQPF1 work even without mmap(2) support
Re-apply licenseheader text in source files for qt4.7
Make sure the declarative plugin of QtWebKit is build once.
Doc: Fixing typo
Update 4.8.0 changes file
Symbian socket engine: remove remaining todo comments
Symbian: tune network autotest heap size so they can run on emulator
Cocoa: QFileDialog: fix filename filter not applied correctly
Fix typo in docs: occurred.
Cocoa: fix qtabwidget auto test failure
Cocoa: fix qwidget auto test failures
Fix QWidget::palettePropagation2() autotest on Symbian (part 2)
Cocoa: Fix qgraphicsproxywidget auto test
Fix QWidget::palettePropagation2() autotest on Symbian
QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
Fix text color in some cases of QML and QStaticText
...
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix conversion of QAbstractItemModel::rowsMoved() parameters
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
VisualDataModel was emitting itemsMoved() signal with incorrect
"to" value when multiple items were moved forwards.
Reviewed-by: Martin Jones
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (103 commits)
Fix non-ascii name issues in ICD.
Compile fix for Symbian 5th and earlier
Improve documentation for QDeclarativeView::setSource()
fix copying webkit guide under windows
Symbian: Fix backspace on empty lines of multiline textedits
Handle CloseSoftwareInputPanel event in QCoeFepInputContext
uikit: Fixes for Open GL ES 1 and for pre-3GS devices
uikit: Fix warning.
Use thumb instructions for uikit
Fix compilation with thumb2.
Update uikit README: svg works, warn about thumb
Fix delayed password masking mid-string.
Disabled splitscreen translation still moves screen
Fix bidi reordering of RTL text with embedded images
Doc: Fixed qdoc warnings.
don't crash when destroying codec list
Fixed infinite loop when loading certain SVGs.
Fix a crash in a11y introduced by d289e54f2d2aa066cb3
Doc: Fixed qdoc warnings.
test: Fix `tst_qfiledialog' in a namespaced build
...
|
| | |\ \ \ \ \ |
|
| |\ \ \ \ \ \ \
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Default graphics memory quota for Symbian applications
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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
|
| |\ \ \ \ \ \ \
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix warning about missing qs60keycapture_p.h header in gui
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The qs60keycapture_p.h header was added twice to HEADERS, once properly
and once without path. The latter caused a warning about nonexistent
header, so removed that.
Reviewed-by: TrustMe
|
| |\ \ \ \ \ \ \
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Reimplement MR1271 over coda patch
Fixed Symbian memory leak in utcToLocal(QDate &, QTime &)
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This restores the option to upload files to arbritrary locations.
Reviewed-By: mread
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
RTz::GetTimeZoneIdL() returns a CTzId object which the client has to
own. But in utcToLocal(QDate &, QTime &) it was being used anonymously
and forgotten.
Task-number: QTBUG-20765
Reviewed-by: Shane Kearns
|
| |\ \ \ \ \ \ \
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix bad merge on a couple of xml examples
DEF file freeze
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: mread
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Miikka Heikkinen
|
|\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Porting the QTBUG-21084 fix to 4.7.4
|
| |\ \ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Porting the QTBUG-21084 fix to 4.7.4
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
This fixes a memory leak. It's SR1 tagged for 4.7.4.
Task-number: QTBUG-21084
Reviewed-by: Honglei Zhang
|
|\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
uikit: get rid of the "min 30fps" for event handling.
uikit: update README
Fix QGLGlyphCache for Open GL ES (1).
Revert "Include trailing space width in RTL text line width"
Fix justification of RTL text
uikit: fix examples to no longer ship the custom fonts
Use CoreText for font rendering on uikit.
|
| |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
uikit: get rid of the "min 30fps" for event handling.
uikit: update README
|
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
This is actually not needed if done correctly.
|
| | | | | | | | | | | | | |
|
| |\ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / /
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (41 commits)
Spelling fix
Fix compilation of qjpeg on MinGW with GCC 4.6
Make the DBus timeout configurable in QDBusAbstractInterface.
Fix non-ascii name issues in ICD.
Compile fix for Symbian 5th and earlier
Improve documentation for QDeclarativeView::setSource()
fix copying webkit guide under windows
Add a QApplication::queryKeyboardModifiers() method.
Symbian: Fix backspace on empty lines of multiline textedits
Handle CloseSoftwareInputPanel event in QCoeFepInputContext
Fix delayed password masking mid-string.
Disabled splitscreen translation still moves screen
Doc: Fixed qdoc warnings.
don't crash when destroying codec list
Fix a crash in a11y introduced by d289e54f2d2aa066cb3
Doc: Fixed qdoc warnings.
test: Fix `tst_qfiledialog' in a namespaced build
Fix files that don't end with a newline character
Fix bug QTBUG-13901, Mac style button rect
Improved comment finding code.
...
|
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fix QGLGlyphCache for Open GL ES (1).
Revert "Include trailing space width in RTL text line width"
Fix justification of RTL text
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
When resizing the font texture the code was using glGetTexImage
which is not available on Open GL ES.
We need to cache the font texture data, and draw the glyphs on
it in addition, so we can copy the data when resizing the texture size.
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
This reverts commit 2fa986aa670bee0fafb30241f40bb3556594e32b.
The fix was wrong. Use the IncludeTrailingSpaces flag if you want
to include the trailing spaces in the text width.
Reviewed-by: Jiang Jiang
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
Since the trailing space is included in the QScriptLine, it may affect
the positions of preceding script items when the text is RTL. The best
solution for this would be to disregard the trailing space in the layout
process, or somehow make it have an advance of 0 so it doesn't affect
the layout. However, to minimize the impact of the change, and to be
consistent with previous work arounds such as
bf992df6434fc37715f728ca09601c5567dd83c9, we simply include the trailing
(visually leading) space in the justification pass for now.
Task-number: QTBUG-20920
Reviewed-by: Lars
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
uikit: fix examples to no longer ship the custom fonts
Use CoreText for font rendering on uikit.
|
| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | |
|
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Check if bridge plugin vector is still valid.
QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Check if bridge plugin vector is still valid.
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Q_GLOBAL_STATIC may be destroyed and we still send
ObjectDestroyed notifications.
This only shows now that we actually send the Destroyed notifications.
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (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.
...
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list
|