| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Fortunately the *default* horizontal size policy was
QSizePolicy::Minimum. However if the size policy was set to for instance
Preferred it could shrink down until it disappeared.
The following patch will do the same as QLabel does it:
sizeHint is the same as minimumSizeHint.
Task-number: QTBUG-2606
Reviewed-by: Gabriel
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Minor optimisation in QMenu
|
| | |
| | |
| | |
| | |
| | |
| | | |
Stops the QMenu re-painting itself for every mouse move event.
Reviewed-By: gabi
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Fix strerror_r in case it returns a pointer that is not our buffer"
Designer: Fix cardinality error in stringlist properties in ui4 schema.
[qtconfig app] Add an app icon.
Mac: Remove Ctrl+Y as redo shortcut.
Fix strerror_r in case it returns a pointer that is not our buffer
[networkselftest] Verify some CGIs on the test server
[networkselftest] Verify the presence and size of some files on HTTP
[networkselftest] Verify PUT and DELETE commands and the protected area in HTTP
[networkselftest] Enchance test to verify the layout of the FTP server.
[networkselftest] Add a test for the FTP proxy server
[networkselftest] Add a test to try the SMB server.
[networkselftest] Add the FTP proxy and SMB ports to the test.
Add new QDataStream version for Qt 4.8.
Long live Qt 4.8!
|
| | |
| | |
| | |
| | | |
This reverts commit 56891588a23adfe4ac6a8fbe01083464dc67e79b.
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Designer: Fix cardinality error in stringlist properties in ui4 schema.
[qtconfig app] Add an app icon.
Mac: Remove Ctrl+Y as redo shortcut.
Fix strerror_r in case it returns a pointer that is not our buffer
[networkselftest] Verify some CGIs on the test server
[networkselftest] Verify the presence and size of some files on HTTP
[networkselftest] Verify PUT and DELETE commands and the protected area in HTTP
[networkselftest] Enchance test to verify the layout of the FTP server.
[networkselftest] Add a test for the FTP proxy server
[networkselftest] Add a test to try the SMB server.
[networkselftest] Add the FTP proxy and SMB ports to the test.
Add new QDataStream version for Qt 4.8.
Long live Qt 4.8!
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10014
Reviewed-by: Trust Me
|
| | | | |
|
| | | | |
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The merge in 1ffc19d083a82c3f717e4f091a3af7b0241b6a6d introdcued
two different versions of the m_cy calculation simultaneously. Remove
the older version and keep the new.
Reviewed-by: TrustMe
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem was simply that QTabWidget does not have a layout (it
does manual layouting, and since that the heightForWidth implementation
it inherits from QWidget require that the widget has a layout it will
not work and it always returned -1 for QTabWidget). The solution is then
to reimplement heightForWidth().
Unfortunately the patch has several workarounds for BIC:
1. QWidget::hasHeightForWidth() should really have been virtual. Instead
we add the virtual QWidgetPrivate::hasHeightForWidth().
Since this is a workaround/bugfix for QTabWidget we decided to keep
QWidget::hasHeightForWidth() internal for now.
2. We cannot reimplement a virtual function in QStackedLayout.
We therefore fix QStackedWidget by subclassing QStackedLayout and
reimplement the virtual functions in the subclass.
This is not an ideal fix, but improves QTabWidget and QStackedWidget
wrt height for width.
Task-number: QTBUG-7792
Reviewed-by: Paul
Reviewed-by: Olivier
|
|\ \
| |/
|/|
| |
| | |
Conflicts:
src/gui/painting/qtextureglyphcache.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If setPen() or setBrush() of a QAbstractGraphicsShapeItem is called with
a pen or brush equal to its current pen or brush prepareGeometryChange()
and update() shouldn't be called. Testing for identical pen and brush is
cheap in comparison with a QGraphicsView update() without seeing a change
Merge-request: 562
Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
|
| |
| |
| |
| |
| |
| | |
This avoids some minor clipping issues observed (see autotest).
Reviewed-by: MortenS
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We were using the height of the texture to position the next row,
rather than just adding the rowHeight. This used to work when the
texture cached grew by rowHeight, now it grows to next power of
two...
Reviewed-by: Eskil
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
When the target directory exists and is readable, QConfFile::isWritable
used to returned true, even though the actual config file was not
necessarily writable.
Reviewed-by: joerg
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
QtWebKit: Fixes compilation on MSVC 64
QtWebKit: Remove translatable strings from tests/hybridPixmap.
Remove overloaded placement new operators
WINSCW compiler fix, too eager to solve inlines
WINSCW boolean fix for XPATH
WINSCW compile fix for HashMap
WINSCW compile fix for WebCore
|
| | |
| | |
| | |
| | |
| | |
| | | |
This patch should be overwritten by the next import of QtWebKit trunk
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | | |
WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading.
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
WINSCW tries immediately solve inlines causing forward declared classes to
be used before they are defined.
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
WINSCW cannot determine boolean type unless it is explicitly defined.
This fix needs to be re-applied always when files are regenerated.
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
WINSCW with templates function declarations and definitions will
have to use same names for variables or you get 'undefined identifier'
Reviewed-by: Miikka Heikkinen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
WINSCW fails to parse function pointer name if it is not
introduced before use.
Reviewed-by: Miikka Heikkinen
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Some QWindowSurface implementations might implement flush as a buffer
Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets
Cleanup & remove unused function overloads from QEgl* APIs
QScrollArea: Excessive scrolling in focusNextPrevChild()
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Some QWindowSurface implementations might implement flush as a buffer
Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets
Cleanup & remove unused function overloads from QEgl* APIs
QScrollArea: Excessive scrolling in focusNextPrevChild()
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Some QWindowSurface implementations might implement flush as a buffer
Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets
Cleanup & remove unused function overloads from QEgl* APIs
QScrollArea: Excessive scrolling in focusNextPrevChild()
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
flip. Such window surfaces therefore destroy the contents during flush.
In order to render correctly on these surfaces, any update, no matter
how small, needs to trigger the entire window to be redrawn.
Auto test included.
Task-number: Relates to QTBUG-9978
Reviewed-by: tom
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QGLWidgets are assumed to be buffer destroyed, however regular
QWidgets assume they can to partial updates and thus need the
preserved swap behaviour.
Reviewed-By: Trond
Task-number: QTBUG-9554
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This should make stubbing out these APIs slightly easier.
Reviewed-By: TrustMe
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QScrollArea: Excessive scrolling in focusNextPrevChild()
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
We were scrolling horizontally even though the widget already fit the
visible area horizontally. And conversely for vertical scrolling.
Improves commit f1e92b2fdf6b6fd8aca0d05176c647dd68e21baa.
Reviewed-by: Thierry
Task-number: QTBUG-9425
|
|\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits)
Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation
Autotest: update to the new values for the locale
do not expand variables in read()'s file name
remove ability to use break() a block outside any loop
don't add -unix to the qmake command line
Increase the timeout for the QNAM getter test to 30 seconds
Remove unstable hosts from the list
qdoc: Output TOC for more class ref pages.
Other fixes to the remote network stresstester
Fix SSL connection problem.
Make sure we don't try URLs that aren't HTTP or HTTPS
Fix menu bar visibility.
Add SSL remote host tests
Split the remote and the local tests in two, in preparation for SSL tests
Add tests for remote hosts
Change the way we calculate the average transfer rates.
Finish renaming
Move these tests to tests/manual.
Add a QNetworkAccessManager stresstest
Add a non-blocking native function too
...
|
| |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits)
Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation
Autotest: update to the new values for the locale
do not expand variables in read()'s file name
remove ability to use break() a block outside any loop
don't add -unix to the qmake command line
Increase the timeout for the QNAM getter test to 30 seconds
Remove unstable hosts from the list
qdoc: Output TOC for more class ref pages.
Other fixes to the remote network stresstester
Fix SSL connection problem.
Make sure we don't try URLs that aren't HTTP or HTTPS
Fix menu bar visibility.
Add SSL remote host tests
Split the remote and the local tests in two, in preparation for SSL tests
Add tests for remote hosts
Change the way we calculate the average transfer rates.
Finish renaming
Move these tests to tests/manual.
Add a QNetworkAccessManager stresstest
Add a non-blocking native function too
...
|
| | |\ \ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits)
Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation
Autotest: update to the new values for the locale
do not expand variables in read()'s file name
remove ability to use break() a block outside any loop
don't add -unix to the qmake command line
Increase the timeout for the QNAM getter test to 30 seconds
Remove unstable hosts from the list
qdoc: Output TOC for more class ref pages.
Other fixes to the remote network stresstester
Fix SSL connection problem.
Make sure we don't try URLs that aren't HTTP or HTTPS
Fix menu bar visibility.
Add SSL remote host tests
Split the remote and the local tests in two, in preparation for SSL tests
Add tests for remote hosts
Change the way we calculate the average transfer rates.
Finish renaming
Move these tests to tests/manual.
Add a QNetworkAccessManager stresstest
Add a non-blocking native function too
...
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
We no longer show the menu bar if it is not
native and doesn't have a parent widget.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Apparently Qt already supports a format pattern for the timezone info, so it
should be mentioned in the doc.
Reviewed-by: Thiago
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The date/time format in QLocale originate from unicode CLDR which has more
format patterns that Qt understands, so when generating date for QLocale we
remove unsupported patterns and convert some other to something that Qt
understands.
Task-number: QTBUG-9500
Reviewed-by: Thiago
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
documentation updated with two new Qt::Key keys
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
816523117bc00cfeb17e347f7fe5f11278a5e871
The quitNow flag needs to be reset at the beginning of exec() to allow
exec() to recurse and be run multiple times.
This changes reverts commit 816523117bc00cfeb17e347f7fe5f11278a5e871 an
introduces the QThreadPrivate::exited flag to fix the race between
start() and exit(), and QThreadPrivate::returnCode to make sure exec()
returns the code passed to exit().
Task-number: QTBUG-1184
Reviewed-by: olivier
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The bearer management code, which this bug is for, was fixed by MR 517
previously.
Task-number: QTBUG-9493
Reviewed-by: alex
|
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
Fix duplicate project entry in visual studio solution file.
Doc
qdoc: Added the index and fixed images in the extra files list.
Speed up qsTr() by caching the translation context
Crash while printing from the portedcanvas example on Mac Cocoa.
qdoc: Fixed .qdocconf files for assistant.
Disable debug-only framework builds on Mac.
Compile (with -no-pch)
Add missing QT_NO_BEARERMANAGEMENT ifdefs.
Introduce a qconfig feature for Bearer Management
Fix MOBILITY-404
Remove holes in bearer management data structures.
Don't link bearer plugins against QtGui unnecessarily.
Added missing newline after warning message when using -L with qml
Doc: updating scripts
Fixed a crash on embedded due to uninitialized pointer.
Fix a race where QThread::exit() is "lost" when called after start()
qdoc: Removed all <table> attributes in favor of using css.
Autotest failure: dialogModality test fails on cocoa (macgui)
Force the bic test to compile in 32-bit mode on Mac
...
|
| | | | |\ \ \
| | | | | |/ /
| | | | |/| |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits)
Speed up qsTr() by caching the translation context
Crash while printing from the portedcanvas example on Mac Cocoa.
qdoc: Fixed .qdocconf files for assistant.
Disable debug-only framework builds on Mac.
Compile (with -no-pch)
Add missing QT_NO_BEARERMANAGEMENT ifdefs.
Introduce a qconfig feature for Bearer Management
Fix MOBILITY-404
Remove holes in bearer management data structures.
Don't link bearer plugins against QtGui unnecessarily.
Added missing newline after warning message when using -L with qml
Doc: updating scripts
Fixed a crash on embedded due to uninitialized pointer.
Fix a race where QThread::exit() is "lost" when called after start()
qdoc: Removed all <table> attributes in favor of using css.
Autotest failure: dialogModality test fails on cocoa (macgui)
Force the bic test to compile in 32-bit mode on Mac
Revert "Doc: Updating design files."
Remove statically allocated pixmaps through the post routine
qdoc: Checked for empty title.
...
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
qsTr() uses QFileInfo::baseName() to determine the translation
context from a URL.
The problem is that creating a QFileInfo object (and thus a
file engine object), as well as processing the URL to determine
the base name part, is very expensive.
By caching the last translation URL and context, qsTr() becomes
5x faster.
Only the most recent URL is cached, because a script's text will
be translated all at once (as the script is evaluated), so for
scripts with multiple translated strings only the first qsTr()
call will cause a cache miss.
The performance could be improved even further by getting rid of
the QFileInfo dependency altogether; created QTBUG-9939 for that
since it's a more risky change.
Task-number: QTBUG-6908
Reviewed-by: Olivier Goffart
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The PMPrintSession inside the NSPrintInfo can get changed by the
NSPageLayout. Refresh the session pointer saved in the
QMacPrintEnginePrivate after showing the page setup dialog.
Task-number: QTBUG-9880
Reviewed-by: Trond
|