| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits)
Amend qfiledialog INTEGRITY patch
Update to latest INTEGRITY Framebuffer API.
Remove support for tilde expansion as there is no home on INTEGRITY.
Remove docs and translations generation for INTEGRITY.
Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY.
Remove QT 3 API support by default for INTEGRITY.
Disable some tests because INTEGRITY doesn't support shared libraries.
Add specific INTEGRITY cases for autotests requiring a target path.
Improve default mkspec for INTEGRITY.
Use Q_FUNC_INFO without line number on GHS compiler.
Add INTEGRITY gbuild.* files to qmake project.
Use the project root from .gpj project files, instead of local path.
Make sure QMAKE_CXX is defined to prevent crashing on some projects.
Add support for .pro-type subdirectories.
Add relative path to the work directory, to prevent filename clashes.
Only call moc if the file needs it.
Use outname to specify the output .gpj to generate.
Use "dll" instead of "shared".
Instead of translating / into _, check if subdir is a .pro.
Do not generate -D defines for project types.
...
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
SRCDIR is not parsed the same way due to the different qmake generation process.
furthermore, the full host path doesn't seem like a good idea to use for the path of the target filesystem.
Use "/" as default.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| |\ \ \
| |/ / |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
tests: allow unstable tests to be marked with CONFIG+=insignificant_test
Fix focusScopeItemChange setting crash
Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
symbian - handle path being passed as part of filename in QTranslator
Symbian - fix compile error when default configured
Compile when -no-rtti is specified as a configure option
Ensure that the RC_FILE is correctly handled in a single configuration
|
| | | |\ \ |
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If a HTTP server responds with gzip-encoded empty content without defining
Content-Length in the response header QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
will crash because it calls zlib inflateEnd for an uninitialized stream.
- Fixed the crash by adding a check if the stream is initialized to gunzipBodyPartiallyEnd.
- Added a regression test tst_QNetworkReply::nb279420gzipNoContentLengthEmptyContentDisconnect
PMO 279420
Task-number: QTBUG-22660
Signed-off-by: Sami Rosendahl <sami.rosendahl@reaktor.fi>
Merge-request: 1465
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
| | | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Although incorrect API usage, this was a regression from 4.7.3 behaviour
Task-number: QTBUG-22489
Reviewed-by: mread
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Properly protect access to pixmap reader thread with mutex
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Previously, access to the data from the reader thread wasn't guarded
properly, causing a crash when the reader thread was deleted prior to
QDeclarativePixmapData (which then attempted to dereference the
thread pointer to cancel the request), or in the case where a
QDeclarativePixmapData was deleted after its QDeclarativePixmapReply
was removed from the jobs queue but prior to processing.
Reviewed-by: Martin Jones
Task-number: QTBUG-22125
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
network auto tests: add QNetworkReply test for pipelining
HTTP: blacklist server for pipelining
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Markus Goetz
Task-number: QTBUG-21369
|
| |\ \ \ \ \ \
| |/ / / / / |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Remove font that may not exists in some OS X systems
Fix regression in styleName searching
Fix styleName listing with the same QtFontStyle::Key value
Fix localized font family access in OS X
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Font family names listed in QFontDatabase::families() should be
localized names rather than their default (English) names, to be
consistent with behaviors in other Mac apps and previous Qt/Mac
based on ATS.
It should also be possible to verify if a font exists with any
family name, regardless it's localized or not. Say we have font
"Hiragino Mincho Pro", which has a Japanese name called "ヒラギ
ノ明朝 Pro", then
db.hasFamily(QString::fromUtf8("ヒラギノ明朝 Pro"))
should return true.
Task-number: QTBUG-22372
Reviewed-by: Morten Sorvig
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This reverts commit 7925f107814e46deb0848d9e6016721ceebfb521.
Needed to fix regressed auto-test
tst_qgraphicsview::update_ancestorClipsChildrenToShape2.
|
| | | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QGraphicsItemPrivate::effectiveBoundingRect() should use ItemClipsChildrenToShape
flag from the parent while looping to check for clipping and not use
its own AncestorClipsChildren flag.
By using AncestorClipsChildren, you're checking if one of your ancestors
clips you, but you really want to know if your direct parent clips you.
Merge-request: 1419
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | |\ \ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix for QMessageBox's autotest.
Fix for the button size calculation in qmessagebox.cpp
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Mnemonic shortcut caused string comparison to fail.
Task-number: QTBUG-22119
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| |\ \ \ \ \ \
| |/ / / / / |
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed wrong QGroupBox check state
Added base 10 to be used with QIntValidator.
Mac: Fix the color of check marks in menus with stylesheet
Russian translation update
Don't directly access QList contents
Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Handle mouserelease only if mouse is pressed in QGroupBox.
Task-number: QTBUG-19170
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fixes an error in QIntValidator, which occurred because
locale.toInt() was missing a parameter for base value and this
led it to presume wrongly that a base 8 is in use.
Task-number: QTBUG-21602
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| | |\ \ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
Fix warning when using QXmlInputSource with non opened QIODevice
HTTP proxy engine - accept standard Connection header
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If a HTTP server responds with gzip-encoded empty content without defining
Content-Length in the response header QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
will crash because it calls zlib inflateEnd for an uninitialized stream.
- Fixed the crash by adding a check if the stream is initialized to gunzipBodyPartiallyEnd.
- Added a regression test tst_QNetworkReply::nb279420gzipNoContentLengthEmptyContentDisconnect
PMO 279420
Task-number: QTBUG-22660
Signed-off-by: Sami Rosendahl <sami.rosendahl@reaktor.fi>
Merge-request: 1465
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
| |\ \ \ \ \ \
| |/ / / / / |
|
| | |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Repaint QProgressBar when minimum or maximum changed
Fix QProgressBar causing timer event spam
Compile fix for Mac OS X 10.7 with 10.6 sdk
|
| | | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The implementation of QProgressBar::setMinimum and setMaximum did not
repaint the widget. This caused the widget to be shown incorrectly in
case you call setMinimum or setMaximum but not setValue.
Task-number: QTBUG-22121
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| |\ \ \ \ \
| |/ / / / |
|
| | |\ \ \ \
| | |/ / /
| |/| / /
| | |/ /
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
networking: regenerate effective TLD table for cookies
QNAM: Fix authentication cache when the password is in the URL
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Two problems:
- The signal cacheCredidentials was not connected in the synchronous
case while it must be connected. (Regression when the threaded http
was merged)
- We cannot cache the credidentials when we proceed the url because
at that point, we do not know the realm (this basically reverts
9bc5a32b875b812c3a706034c8c27614f86bd138)
Merge-request: 1459
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Task-number: QTBUG-18411
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The scenario was this:
If you had a height for width item, and that item had a maximum
width of 50.
If you called
item->effectiveSizeHint(Qt::PreferredSize, QSizeF(100,-1));
it would return (100, ?), thus violating its own maximum width.
Merge-request: 1423
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian configuration parameter change for linux building
Improve patch_capabilities script output.
Fix QtSql autotest server addresses
Update SQLite version number in legal document
Update SQLite version mentioned in licence document
Symbian Linuxification building case changes
Fix FTP example to handle failure to open network session
Use QBasicAtomicInt as a static variable
FTP - fix interoperability issues with SIZE command
QS60StyleAnimation exception safety
Catch potential throw in ~QSymbianControl
Fixed access to null threadData in ~QObjectPrivate
Fix the build for makefile build system of Symbian
Symbian - fix compile error when default configured
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Fix QtSql autotest server addresses. Old server which are located in
Oslo shall not be used. New servers are located in Brisbane.
Reviewed-by: Trust Me
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Doc: Fix example code
Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
Accepting predicted text using hardware keyboard replaces unwanted part
Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
Workaround to VideoCore III scissor bug.
Fix to QGLWidget crash
Update def files
Fix crash on exit when overriding signal handlers in states.
Typo fix
Add new signals to indicate GPU resource usage.
symbian - search drives for translation files
symbian - search drives for translation files
Cannot flick to the end of a horizontal list view width LayoutMirroring
Backport more imports directory caching changes.
Symbian - fix deleteLater not working from RunL
Fix more test DEPLOYMENT statements for Symbian
Fix deployment for declarative tests, examples on Symbian
Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
Backport imports directory caching performance optimization
|
| | |\ \ \
| | |/ /
| |/| /
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix crash on exit when overriding signal handlers in states.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I0e73948f18aa1b78c7e92677167673b84a90a450
Task-number: QTBUG-21617
Reviewed-by: Martin Jones
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Backport more imports directory caching changes.
Fix more test DEPLOYMENT statements for Symbian
Fix deployment for declarative tests, examples on Symbian
Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
Backport imports directory caching performance optimization
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Rohan McGovern
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-21306
Reviewed-by: Rohan McGovern
|
| |\ \ \ \
| |/ / / |
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Checking constraining facets for double failed if enumeration
restriction had values INF or NaN.
There were two issues that caused validation to fail:
- wrong conversion function was used when constraining facets for
double are checked, which caused values to be in lower case
- case when both restriction and default value are NaN was not
handled correctly
Task-number: QTBUG-21375
Reviewed-by: Honglei Zhang
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is in order to have a regression test for QT-5304.
However the test is also checking basic functionality of head
requests too.
Task-Number: QT-5304
Reviewed-By: Martin Petersson
|
