| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Change-Id: Idb88b4e72548dfa641c6b8ce78a661fa61757ad0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
| |
An implementation for BlackBerry devices based on the BPS netstatus API.
(backport of qtbase/cf66e41728ae70595365833c9ed00d0e2e6c4200)
Change-Id: I155f287274c4d92e0546740b8dbe595ea030b505
Reviewed-by: Peter Hartmann <phartmann@rim.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If available printers in CUPS support.
If the number of available printers changes, we want
to update the count. Additionally, if that number has
gone to zero, we want to ensure that the number of
available printers in the static object is reset to
zero.
This fixes a crash that occurs if:
* You print
* You kill cupsd (or it crashes because you're porting it and your port is
* unstable)
* You try to print again before restarting it.
cherry-picked from qt5/qtbase eda0e120e9e2e7b7be747f4ed035d686c9547769
Change-Id: If4640045073acaecec4495f5cb01806ae859cf65
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QMetaObject is POD, so its constructor is implicit and trivial
(doesn't initialise anything). QAbstractDynamicMetaObject doesn't add
a constructor, so the QMetaObject sub-object remains
uninitialised. The users of either class must ensure they initialise
the members if they will be accessed.
Task: QTBUG-23214
cherry-picked from qt5 95cb2a1b5caf7d7158dd1176380c1458ea22b54f
Change-Id: If0e6b129e1bddc3b70feafa4b318280bb715ab04
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
| |
This change does not apply to qt5.
Change-Id: I0d9b9cc39270a377b8f6f8289ad1fd7a05dd0367
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This guarantees that qmake gives them the proper flags (non C++) while
building these asm files.
cherry-picked from qt5/qtbase 1ef74a763a726829bfc26224d82acff207fdc8bb
Change-Id: Iec8dbb2d25700ead99d46b054665b817bbe79b7b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
| |
This change is not required by Qt5.
Change-Id: I8b6ea3fcd1c879ee7e74bb304ef27d090d53e6e5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
completer_data() was attempting to find the first folder which did
not begin with a '.' character under QDir::root() for usage during the
test.
However, a typo caused it to find the first folder even if it _did_
begin with a '.'; unless the first folder returned by entryList()
was ".", in which case no folder would be found.
(cherry picked from qtbase commit 0776746d47c9b0d575b6190b1882c571a76ee086)
Change-Id: I1d98afa071ea4300e4e2f0aa324e8c1fd8a0728e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Needed for the BB10 Cascades profiling. There are more reasons for
introducing this patch:
1) Cascades do not use QtGui library for QML rendering. It has its own
paint engine with client-server architecture. Profiler traces are sent
asynchronously from non Qt renderer thread to the Qt client.
The QPerformanceTimer has to be patched too, cause we need to know time
difference between tracing zero time and some time in past,
see: qint64 elapsedToAbsoluteTime(qint64 absoluteMonotonicTimeNs) const
2) Since we need more sophisticated trace engine in cascades, this patch
allows explicitly assign custom class derived from QDeclaraqtiveDebugtrace
to the trace framework.
If no custom instance is assigned, the default QDeclarativeDebugTrace
instance is created implicitly on first trace request.
Using custom trace instance which is not part of Qt
(it is part of libbbcascades) allows us to implement all Cascades trace
special needs in libbbcascades and not to carry Qt with the platform
specific code.
3) The NO_CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE macro is introduced to
allow custom trace engine only on the bleckberry platform,
see declarative.pro.
If this macro is defined Qt compiles from its original code.
4) Possibility of custom QDeclaraqtiveDebugTrace instance might be usable
for other projects which needs to extends somehow default Qt trace
functionality.
5) Patch is not intended to be applied to Qt Quick 2, since declarative
debugging infrastructure is changed there.
(cherry picked from commit f13b52f25c1e0bc26dcf3ea304b3495f7d5cd370)
Change-Id: I199211c1de66e930e252e8c033503d7f4940565f
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This event can be used by any platform plugin to implement
special application panels/overlayed menus.
Currently used by QNX only.
This replaces sending fake Qt::Key_Menu presses in the QNX
plugin. Qt::Key_Menu is already used when invoking context
menus with the keyboard.
( backport of qtbase/9695df4d44b228e7e778ff17d5cccac30967b1fd )
Change-Id: Id5cf96758f1104f454a2bb977b367d09d4685b62
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was triggered by using a QVideoWidget without a parent.
This patch is not necessary in Qt5, as the API there is based
on QWindow, it has no call to nativeParentWidget().
Change-Id: I2fe2b872da314e507bcfcb69dfea4a837700ac71
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adds support for fetching and parsing Proxy Auto Config files if one
is specified in the Mac System Preferences
Task-Number: QTBUG-2069
Task-Number: QTIFW-28
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit c524bbbb8aa4ba10bac68292a3078534f1b51df5)
Change-Id: Iad8fa2a7517f9254e9c9a3c573bec0f7f4df0dfb
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
| |
The spec doesn't allow for the piAttribList parameter to be 0.
Task-number: QTBUG-27331
Change-Id: I75da84789cf8044e9283bbab29b6435b0d352f22
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
| |
This is a backport of
qtdeclarative commit 581c57125368eb6ef0b853e037649cf0c1a8bc80
Change-Id: Iab31f106b83958a62d9fcbb53fc1daf6931d3257
Reviewed-by: Alan Alpert <416365416c@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The receiver count needs to be correct in connectNotify() to be
compatible with ordinary connections.
Fix this and add test.
This is a backport of qtdeclarative commit
b1c6e095404ccb7788e6b12fff692c71f4900815
Change-Id: Ic3145a536c928eccfcc29b4d010a526135b654b0
Reviewed-by: Alan Alpert <416365416c@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This gets rid of the heap allocation of the QByteArray.
This change is not needed in Qt5, as there, QMetaMethod is used
as the argument, and therefore there is no need to construct a
SIGNAL-compatible string in memory.
Change-Id: Ie2023aeb99bc8f792d437ec604e9989a5efe456b
Reviewed-by: Alan Alpert <416365416c@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
We were breaking out of select() too early with a timeout of -1.
This is a backport of
qtbase commit ba8f3002d49d9941b2991fbe4d78883ea59827b2
Change-Id: I65e534caea665fea3d99de621bcdbcf7c47fac55
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This BPS bug has been fixed with the latest BB10 release.
This is a backport of
qtbase commit 4a755752e919b8a6d68bea265c16c44b90eeb545
Change-Id: Ifa9fb9efd8c12aef6e554f5bf7a731fdf983f83d
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
| |
This is a backport of
qtbase commit b72904e8540e4aa1f1396893f5d1b216d745cdc3
Change-Id: I7489dc69fa505e76f707531e70a8011d596da19d
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
|
|
|
|
|
| |
Change-Id: Id1e293352d90a151e31ba73168400aacebc588dc
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Take into account brush transformation for TexturePattern fill.
Example : arrows are not rendered properly in
http://www.youtube.com/leanback website.
cherry-picked from qt5/qtbase 2f2656002735a14687c5d6b5a3250666a8e102e3
Change-Id: I11fead281e372b2a24da835f85c327879e9997f0
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The test historically relied on obscure environment variables
to determine whether the examples, demos should be run.
Remove that code and check whether the executables exist.
In the Window manager code, no longer exclude WS_POPUP windows,
which seems to fail with the current Qt 4.8.
Task-number: QTQAINFRA-428
Change-Id: I88d2be085cb543effc800115885e8ff86a1cf7ba
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
SQL Server 10 introduced stricter rules for TIMESTAMP validation,
making it necessary to specify the decimal digits.
Other databases might do the same as well, so this patch introduces
a check for the TIMESTAMP column size and adjusts the decimal digits
parameter as needed.
Task-number: QTBUG-2192
Change-Id: If6d798c6c928ebda75bc474e49a07fbbfbe5816c
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry picked from qtbase/b8b79a0f37ec74fd5b4ad829e522a384ba3622ae)
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed remote command hanling in Qt Assistant. Now Qt Assistant tries to
raise and activate main help window after processing the remote command.
Task-number: QTBUG-25407
Change-Id: I6408b9795bdf21bb920830608ba23bfda7d41604
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
(cherry picked from qttools/883147fdaeeb2effbdb8a93a48f1ced49d56693e)
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a slightly less awkward approach (keeps backwards-compatibility) while
speeding up startup for applications that don't use the old import path.
Also prints a warning to let developers know they should migrate their code when
possible. Completely disabling the Qt 4.7 import is still possible by setting
QT_NO_IMPORT_QT47_QML.
This takes around 10-15ms off a very simple "hello world" on my macbook.
(backport of qtquick1/2a3e9eb0ba00acf30b9cc40f7e2e4347726fb6b4)
Change-Id: I6960e7c28bb4f153d793802b978c1944977e8ed4
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
| |
Regression introduced in 0aa9b30432cec3b7.
Partial backport of 12590582a2f676912690 in Qt 5.
Task-number: QTBUG-24453
Change-Id: I9522cff661849981096d4efe70164841739ff359
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Replace qWait() by qWaitForWindowShown().
Add QEXPECT_FAIL on Mac for tst_QFocusEvent::checkReason_Popup
and tst_QFocusEvent::checkReason_ActiveWindow.
Task-number: QTQAINFRA-428
Change-Id: If172085850ac1bd7cf6187b0e767b60fe46be934
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The tests are now run from the 'debug',
'release' subdirectories on Windows by 'make check'.
Go up one directory so that the relative paths are correct.
Network tests only.
Task-number: QTQAINFRA-428
Change-Id: I03bc04028b405bc4f897cbf9d7cb400cc009bb8f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The state of native menus is currently updated in two incompatible ways
on Mac, either by updating the state of native menu items in a native
menu (when setEnabled is called) or the state of the native menu
item containing the native menu (when the menus are initialized and
when a modal dialog is opened/closed). This causes various problems,
e.g. inability to enable a menu that was disabled before menu
initialization or menus getting enabled incorrectly after a modal
dialog is closed. Fix by always setting the state of the native menu
item that contains the native menu.
Also, autoenable is active for the main menu, resulting in unnecessary
menu validation calls, so turn it off.
Task-number: QTBUG-25544
Task-number: QTBUG-26399
Task-number: QTBUG-7538
Change-Id: Iab335af633604e7b3017eaa55464d1b8fdd7b821
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are cases where a widget has a parent, but is also a toplevel window at
the same time, causing the system window to have no parent.
For instance, a QMenu usually has a QMenuBar as a parent, however QMenuBar
itself does not have its own platform window, as opposed to QMenu. Thus
QMenuBar::parent == QMainWindow (for example), but QMenuBar::platformWindow ==
0x0; QMenu::parent == QMenuBar, but QMenu::platformWindow != 0x0 (which is
QMenuBar's value).
cherry-picked from qt5 04d296d64118ba2d647668494872d93cc1ef7ed1
Change-Id: I9304c5c9e64dca012a1903de7c80c168a701a5ea
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
QNX uses .sym for files containing debug symbols.
Patch-by: Greg Bentz
(cherry picked from commit 291e1a9e67499f6fa8285a1d4ed1ea6e8297dd5f)
Change-Id: I03202da79de0f606c7c99a2db986d2343e51663d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
removeFromParent() must not be called from raise()/lower(), because it wrongly
sets m_currentParent to 0, causing the parent/child link to be broken after a
call either of these methods.
This is a backport of
qtbase commit 4c33efc3228d82a82e13fe8c196b8c74a4998572
Change-Id: I5970cd2b2e0d58ef01dd99c10748195220d0e006
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
This is a backport of
qtbase commit d162f276714f04b07827dfd525deea45dc55a5f1
Change-Id: I3ae3994d305eebd61773e175332cecfa1d9cde51
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The format of the PPS object has changed, it is now prefixed with
[n], so be more leninent in parsing to support both formats.
This is a backport of
qtbase commit fda3fac1d276952ddac4f5a916339db1940082d5
Change-Id: Ibb9b2bef150ca184e2bb234e55e04975552f10b1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I8eb912a90185f0eceac8cf2918c3971e3472a8c4
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Updated service to include parent ids. Since this
will break client compatibility, the service
has been renamed to 'DeclarativeDebugger' from
'QDeclarativeEngine'. This is effectively a backport
of the 'QmlDebugger' service from Qt5.
Change-Id: Ic3000712d986e19bdf89417e9c4c23229d56f9dc
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Mac OS X 10.7 comes with the family of Stix fonts, some
of which exposed an ugly layout bug in the QFontComboBox
because the ascent/descent ratio is very large due to
a very high ascent, so centering the text vertically might
cause most of the text to be clipped away.
The solution is to detect when the ascent is larger than the
height of the destination rectangle (hence a large part of the
characters will be clipped) and use the actual bounding rect
for centralizing instead. Since this only happens for a
very few of the fonts, the overhead of getting the bounding
rect should be tolerable.
Task-number: QTBUG-26691
Change-Id: I4f1a9b3c63138fde4dfdfa99d8581458c59b7ff6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The tests are now run from the 'debug',
'release' subdirectories on Windows by 'make check'.
Go up one directory so that the relative paths are correct.
Non-network tests.
Change-Id: I8d0f806ff6708c3111a39c861ed46b21881acc7b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This makes it clear that the mChildren size must be 0 at this point,
indicating otherwise an inconsistency in the logic of the child windows
management.
cherry-picked from qt5 72d7a833bd6cd2074f45c1ea32986d498b6dd476
Change-Id: I7c0eb9b1b1121b708badb46bd423de0e75d206a6
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
| |
Change-Id: Ib7b68401e683b20dea42b7cf597784a13a995984
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
| |
- Assigned/Unused variables.
- Unsigned comparison >= 0 is always true.
- Constructor initialization order.
- Signed/Unsigned comparisons.
Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ic983e09769c812412defd6f84298770235c3ed48
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Always clear the XSizeHints before retrieving with XGetWMNormalHints
because if the window doesn't have size hints set the structure will
remain uninitalized. Clear XSizeHints in other locations as well just
to be safe.
Task-number: QTBUG-15418
Change-Id: Ia9a0c485389bf27016ee7f206a3a916d0bbcbcfa
Signed-off-by: David Fries <David@Fries.net>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Qt 5 fix (aec5b76) doesn't apply here, because it introduces
a new symbol that might break forward compatibility if code
compiled against a newer Qt 4.8 is run against an older Qt 4.8,
and QScrollBar::wheelEvent() ends up being devirtualised.
So copy the guard clause from QWidget::event() here.
Task-number: QTBUG-27308
Reported-by: chenjiexin
Task-number: QTBUG-21534
Reported-by: Martin Koller
Change-Id: I5d2f823c65bae8cff33bac320c37e6496b14646c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
We did coordinate rounding of the fill in the raster paint engine to
match how drawLine_midpoint_i rendered lines. With the new cosmetic
stroker in 4.8 this rounding is not needed anymore.
Task-number: QTBUG-26013
(cherry picked from commit b6acec1e5d55d03ad3a0a70d2cf371d3f8fde629)
Change-Id: I0324e3a45c525890fb58817a180c6aa712716780
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
| |
When Qt was built statically then the Mac specific resources were not
being loaded which meant some style specific images were not used.
Task-number: QTBUG-25391
Change-Id: Iad538b5f1935ed1744617d6e47ae3e68aa36afac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-27263
QWExtra object pointer is not guaranteed to be valid in
QWidget::unregisterOldDnd() since commit
f6bf4b2baa91e55f40596bf3f2823b119fdfa5e0. To avoid crash we have to check
QWExtra object pointer of the native parent widget before access it, and
if the pointer is not valid we should check its native parent widget
recursively.
Change-Id: I764fea4a0826cff751dd74a0fb67e0d2971c1d49
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Set fd in openPrintDevice() so that it gets cleaned up properly
in closePrintDevice().
Backported from the Qt5 commit:
99bab571b4cb41362e891f1bb1e812119701c932
Task-number: QTBUG-14724
Change-Id: I02968d597822b636078ae89566dd8ed8a948019b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|