| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
The QmlDesigner(Bauhaus) should not rely on -nokia-developer
Reviewed-by: Marco Bubke
(cherry picked from commit 8ad396891f2a4966ad3cf943f99e208211e956bb)
|
|
|
|
|
| |
Reviewed-By: Oswald Buddenhagen
(cherry picked from commit 7412ac5b38d83b627a372a525f271c225f9c1f70)
|
|
|
|
|
|
|
|
|
|
|
| |
Breakpad is a portable crash handler. It sends the raw crash
information to a server for analysis. This analysis needs debug
information. Consequently, we compile with debug info even in release
mode if qt-breakpad integration is requested (via an environment
variable).
Reviewed-by: ossi
(cherry picked from commit 1a99cdbb36334e17c34b38dd5df1bdd70167b42a)
|
|
|
|
|
|
|
|
| |
Fixes crash in creator. If flag is true notifications are sent. It is important
that positioners work correctly and don't leak.
Reviewed-By: Alexis Menard
(cherry picked from commit 3b43389b78925ce87d660c343c925fa280b91e11)
|
|
|
|
|
|
|
|
|
|
|
| |
This ensures that if the component has already been completed, itemChange()
is called. This is required to modify QDeclarativePositions in the visual
editor, while keeping a legal state. Without this patch notifications are
missing and the Positioner keeps track of already deleted children.
This resulted in a crash.
Reviewed-by: Thomas Hartmann
(cherry picked from commit 1f8bb573f06234a3d13fb57de5eb644824d5024f)
|
|
|
|
|
| |
Bauhaus needs this export to manage layouts.
(cherry picked from commit 858469445ceb745c70dad9cd4f913acc34683e15)
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit f7a439a0a00b0bdd6ebeff8bfd5ee2285eab1398)
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit 1ab457d5db184c53d9857a7b425051e5aa5ff2e0)
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit 1f43e68c4ca5b28444b046deff1658b1b4b1923d)
|
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 6f35701275ab0cd80daec45b3407725b10571693)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae)
Conflicts:
tests/auto/declarative/qdeclarativeconnection/data/error-object.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml
tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
tests/auto/declarative/qdeclarativeqt/data/quit.qml
tests/auto/declarative/qdeclarativeview/data/error1.qml
|
|
|
|
|
|
|
|
| |
Qt 4.7 is still supported, but deprecated.
Reviewed-by: Martin Jones
Task-number: QTBUG-13799
(cherry picked from commit 4fcf055f66cc23c9e60a7add489e394420e71914)
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit 746954581f06e0bca98f25eb95dca09c663d47bf)
|
|
|
|
| |
(cherry picked from commit 3e3ce984b54a0b199bf5d4f5e3dcb0a9d5b5bd79)
|
|
|
|
|
|
|
|
|
|
| |
The bug was that when querying for the maximum text length, the case
where an invalid QVariant was returned (which is allowed) was not
handled properly. This would lead to input being blocked by the input
context when it shouldn't.
RevBy: Sami Merila
(cherry picked from commit 3bb3af84bef3c0472ca8ed0d5c6bb3c82320956d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since screen geometry changes before client area geometry is
changed in Eikon, we need to send two resize events, one for screen
area change and one for client area change.
Note that the correct way to detect client area change in applications
is to connect to QApplication::desktop() signal workAreaResized(int)
instead of filtering for resize events meant for QDesktopWidget.
Task-number: QTBUG-14058
Reviewed-by: Jason Barron
(cherry picked from commit 0725abc4607755833a1eb7cb9e083add48d03a88)
|
|
|
|
|
|
|
|
|
| |
for some bizarre reason, mingw doesn't like double quotes.
so instead of building some more elaborate custom quoting, just let
qmake do it for us.
Reviewed-by: mariusSO
(cherry picked from commit fa5c83003db5dea46fc045b2fd90e6308a0d8911)
|
|
|
|
|
|
|
| |
Although it's a private header we use qdeclarativedebugservice_p.h in
creator / qmljsdebugger library. Working with a copy of the header in
the autotest hopefully catches some bc breakages.
(cherry picked from commit 31dcf2b4028b1f76301fc69fccff0a9474a0a135)
|
|
|
|
|
|
|
|
|
|
| |
Make target "unsigned_installer_sis" can now be used to create
unsigned smart installer sis. The contained application sis
will also be unsigned.
Task-number: QTBUG-13902
Reviewed-by: axis
(cherry picked from commit 6d5309c2fbdbf15948b430de103f393c5af5b7cd)
|
|
|
|
|
| |
Task-number: QTBUG-13893
(cherry picked from commit 085a121cb1ebba38d62c924500dbc71806b29b3c)
|
|
|
|
|
|
|
|
|
|
|
| |
Starting from 4.7.0, QVariant is recognized as a standard type by the
meta type system. ActiveQt needs to consider this while converting
COM VARIANT types to a QVariant.
Task-number: QTBUG-13845
Reviewed-by: Volker Hilsheimer
Reviewed-by: Olivier Goffart
(cherry picked from commit fc50d7ecaacfbfef1dbefd6ffdc083cb66c5633c)
|
|
|
|
|
|
|
|
|
|
| |
When a native window handle is created for a widget that has override
cursor set, we should reset the cursor on the parent and set the cursor
on the new window handle.
Task-number: QTBUG-6185
Reviewed-by: Olivier Goffart
(cherry picked from commit 9e9a7bc29319d52c3e563bc2c5282cb7e6890eba)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously manual editing of the pkg file was required to publish
application using smart installer. Now a proper app_installer.pkg
will be created as long as application has protected range UID.
Also changed "make installer_sis" to always generate the application
sis as publishing process supports signing both application and its
smart installer wrapper packages in single step.
Task-number: QTBUG-13991
Reviewed-by: axis
(cherry picked from commit bc8409b9d04be54d98ca97d96c32473039f58a80)
|
|
|
|
|
|
| |
Task-number: QTBUG-13988
Reviewed-by: TrustMe
(cherry picked from commit 1e4f736c2825c8c36ec74719efbc723f6374d072)
|
|
|
|
|
|
|
|
|
|
|
| |
The assert "Internal error: Plugin imported previously with different uri"
happens on Windows. $QTDIR\imports, which is prefixed to the
search path, is still written with backslashes. Unify this to forward
slashes for all paths.
Task-number:QTBUG-13994
Reviewed-by: mae
(cherry picked from commit 0aa6360b7648ddeb8a905960265eb46d8c12448f)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change 7c673a4cf64ba04 introduced some autotest failures in the
fpe_steepSlopes test in QPainter.
Since the other rasterizers all deal in a 26.6 fixed point coordinate
space we should snap the line vertices to this to prevent floating point
overflows due to very steep slopes.
This also necessitates keeping track of four different slope / inverse
slope increments for each of the four edges.
This also fixes a previously QEXPECT_FAIL'ed test case.
Task-number: QTBUG-13429
Reviewed-by: Trond
(cherry picked from commit 93199a5b7082fd484b7f21ad4825d71693ecead2)
|
|
|
|
|
|
|
|
|
|
|
|
| |
With a large pen width and a small scale, due to the hacky way we draw
points (stroking a line from (x, y) to (x + tiny_amount, y)), we some
times end up snapping these two points to the same in rasterizeLine().
If we instead apply the SquareCap before we do clipping / snapping we
don't get this problem.
Task-number: QTBUG-13429
Reviewed-by: Trond
(cherry picked from commit 7c673a4cf64ba043bb27f90287517bdcdd7a21db)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The use of libconninet caused Qt to have a cyclic build dependency.
Which was solved by embedding a copy as a 3rd party library. Maemo has
since donated the libconninet code to Qt because (1) it was a private
Maemo API and (2) the Qt ICD plugin is the only user of the library.
This commit moves the relevent code from src/3rdparty/libconninet to
src/plugins/bearer/icd and deletes the rest.
Task-number: QT-3893
(cherry picked from commit f532d8fcd236be9933e4186a95561e1c264de277)
|
|
|
|
| |
(cherry picked from commit 2ff0dee1b97348a750532223f0a318596c93d412)
|
|
|
|
|
|
|
| |
the refcounting to work in ICD.
Fixes NB#188145 - Network interface doesn't go down after last client disconnects
(cherry picked from commit 4acbb418b1ad093ad848143218a10ee2957db282)
|
|
|
|
|
|
|
|
| |
Includes Jay's fix for the JSC memory consumption on Symbian
https://bugs.webkit.org/show_bug.cgi?id=34349
See also commit 03b7a3cffba609df56b4ccadacae6b6f985e96e9
(cherry picked from commit dbf1d0339a0cfbe60e6b3e45f39e6c02aa3de0a8)
|
| |
|
|
|
|
| |
(cherry picked from commit b750bb085029117497d26a24dcd590fbe34fe281)
|
|
|
|
|
|
|
|
|
|
|
| |
Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator
accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a
private header, where we nevertheless can make some BC checks/guarantees.
Aaron Kennedy agreed with the idea.
Task-number: QTCREATORBUG-2179
(cherry picked from commit c1a7deedf1628e0dd3a5fbf92d97c4151d17fb5a)
|
|
|
|
|
|
|
|
|
|
|
| |
Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator
accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a
private header, where we nevertheless can make some BC checks/guarantees.
Aaron Kennedy agreed with the idea.
Task-number: QTCREATORBUG-2179
(cherry picked from commit 63c4c0449361ced03838e51d18e1113740f27fa9)
|
|
|
|
|
|
|
|
|
| |
... by handling HTTP 30X responses and using QNetworkAccessManager
instead of QHttp. The server now sends back a HTTP 302 instead of a 200.
Reviewed-by: Markus Goetz
Task-number: QTBUG-13892
(cherry picked from commit 15ddcea2d15b7d7731e24151b0a30990e77efe74)
|
|
|
|
|
|
|
|
|
|
|
| |
Now returns correct value for Symbian4 platforms with
QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should
also return correct value even if it doesn't get set in environment.prf.
Task-number: QTBUG-13802
Reviewed-by: Shane Kearns
Reviewed-by: Janne Anttila
(cherry picked from commit 0aad0d2043e061469b7139483c489dc6f823490b)
|
|
|
|
|
|
|
|
| |
The loop looking for posponedLookup in the lookup thread wasn't locking
the mutex before trying to access/modify the list.
Reviewed-by: Andreas Kling
(cherry picked from commit 45c2ac4f1e1218f595b1d21691c8dec4eaa1a021)
|
|
|
|
|
|
|
|
| |
Many things have changed with QML debugging in Qt Creator. Now docs
simply refer to Qt Creator documentation.
Reviewed-by: Leena Miettinen
(cherry picked from commit f61d2d16310aa0a87ec1ba823f903f19575aed7c)
|
|
|
|
|
|
|
|
|
|
| |
When configuring with -no-multimedia then the plugins rule should not
be depending on multimedia, otherwise it will not try and build any
plugins.
Task-number: QTBUG-13912
Reviewed-by: Rohan McGovern
(cherry picked from commit c52224f8010bf90732e5b2ad6cef84f9bd248787)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Stroking a path can sometimes result in inconsistent rendering
especially when combined with a clip. For example, if the logical edge
of a clip rect coincides with the logical edge of a path then it can
happen that the edge is not painted correctly because the stroke lies
outside the bounds of the clip rect. To workaround this problem, we add
the 'aliasedCoordinateDelta' such that the rounding will err on the
side of caution. This improves the correctness when using the raster
engine as a reference.
Task-number: QTBUG-13165
Reviewed-by: Samuel
(cherry picked from commit 74f09c794d5fdcb8f4b547b1c55bcd512ef07b95)
|
|
|
|
|
|
|
|
|
|
|
| |
This is a regression fron 4.6 release. Menu entries with some specific
roles are automatically merged to the application menu. They are now
translated based on the context "MAC_APPLICATION_MENU" instead of
"QMenuBar" context. This patch eanbles the use for both contexts.
Task-number: QTBUG-13878
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 7d878ba53909157cf1911c30ce973378589c2cc0)
|
|
|
|
|
|
|
|
|
| |
The Drag&Drop callbacks need to be correctly aligned to not crash
in the graphics SSE code.
Task-number: QTBUG-13787
Reviewed-by: benjamin poulain
(cherry picked from commit a7c28aa588417c0a75f82d55019814443f889340)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When the last item is the current item and is removed,
QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's
viewItems member is cleared. This commit makes sure that viewItems is
restored by calling QTreeView::doItemsLayout() in this case, preventing
that the scroll bar range is set to zero temporarily and the view is
scrolled to the top unexpectedly (this was a regression in 4.7.0:
QTBUG-13567).
Merge-request: 2481
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit 6da6b7099d4e0b49329793e4b90703ec3d868048)
|
|
|
|
|
|
|
|
|
| |
QTextControl should no longer inherit the layout direction of
parent widget as its default text direction.
Reviewed-by: Eskil Abrahamsen Blomfeldt
Reviewed-by: Lars Knoll
(cherry picked from commit 6397e5bc49f11e20a9d1838d8d8df46dd9486263)
|
|
|
|
|
|
|
|
|
|
| |
For QLabel, text direction should be determined by actual text
(if it's a simple text label) or the textDirection() property
of the defaultTextOption of corresponding QTextDocument.
Task-number: QTBUG-13552
Reviewed-by: Lars Knoll
(cherry picked from commit 9b20aac0ad83b917c46cc44b78dc90fb1d238fe8)
|
|
|
|
| |
(cherry picked from commit 90431a96ca0558ac82ccd588faf1b0aed55abbfe)
|
|
|
|
| |
(cherry picked from commit 5372b313127302d94c748732052dd62d0e38a1cd)
|
|
|
|
| |
(cherry picked from commit eef26bc8521da62db0dced6796eceb7c27f64160)
|
|
|
|
|
|
| |
Task-number: QTBUG-13754
Reviewed-by: Martin Jones
(cherry picked from commit 46e49547f8e4614cd504b0af0d52d4e2768b57c3)
|