| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When building Qt static on Mac, the test included actually stops
the build process, prompting the user for 'Promteroo?'
The reason is that configure runs qmake on all the tests inside
the test/auto directory, including the one that is meant for
testing qmake itself. In other words, this test should not
be qmake'ed when running configure, only when running the
qmake auto test. However, the qmake auto test does not run
the prompt test anymore either. So the solution for now
is to just comment out the test project as well.
Reviewed-by: alexis
(cherry picked from commit 62624c575bd784b36b1d080d32f168e0668ca15b)
|
|
|
|
|
|
|
|
| |
Make sure that we build objective c files with visibility
hidden as default
Reviewed-by: prasanth
(cherry picked from commit b798fc523446b4b7c7e888f7ef504202730e6cb5)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Regression against Qt 4.4. Children of items with ItemClipsChildrenToShape
would only be discovered if the view's expose region contained the outer
bounding rect of all items, _if_ there was at least one item in the
scene that enabled ItemIgnoresTransformations.
The reason for this bug is that the presence of an untransformable item
causes the item lookups to go through a different path
(QGraphicsViewPrivate::itemsInArea()). This function had the bug that it
didn't correctly discover children of clip-items. Because of this, in
the provided test case you could "work around" the bug by either removing
the clip flag, or the transformation flag.
Task-number: QTBUG-4151
Reviewed-by: Alexis
(cherry picked from commit f9d6862d13ae38c59ec4a58092c8126620801e0b)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit f85545a53bae8cbfbc0192d4730d181d7525a65d)
|
|
|
|
| |
(cherry picked from commit a8ef13fa6feafc63ef4d571c95287ac66afc5825)
|
|
|
|
|
|
|
| |
This fix just fixes up coding bugs here and there
Reviewed-by: Brad
(cherry picked from commit ce94e9575a9f623f599a16d69051480a94300b7e)
|
|
|
|
| |
(cherry picked from commit 003d454ce8350cc279c2de53848c7a4533dc939d)
|
|
|
|
| |
(cherry picked from commit c2f946034bb68b7dbf508ac640d692066821a400)
|
|
|
|
| |
(cherry picked from commit 75e19e6165229db5465704bf14d8e938c3f0c36d)
|
|
|
|
| |
(cherry picked from commit 8c3169c487fc863c59b58699b3c570cde3a37bd9)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Removing dubious intermediate detection code that also had a buffer
overflow. The results were inconsistent and not dependable on.
Processing was inefficient and end value to user experience dubious.
Test cases that abused the former behaviour were changed to consider
input in an Intermediate where it was previously considered Invalid.
With this change, user input will mostly be considered in an
intermediate state, until it is effectively validated.
Task-number: 255019
Reviewed-by: Anders Bakken
(cherry picked from commit c5acc6ee80d9f429fc8f4d9dd3cca51f3efdf6d5)
|
|
|
|
|
| |
Reviewed-by: Trust me
(cherry picked from commit 101af7f0dc2eb8554a911ccb4c80ad0966db5780)
|
|
|
|
|
| |
Task-number: QT-1683
(cherry picked from commit e4b6d83ae9c060805d630f94f97447655b2e78ed)
|
|
|
|
|
|
| |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit feec449d63c355dd465dea7674d43923e999911e)
|
|
|
|
|
|
| |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit b779e38ef18fa3a16ba60bfe85aac650e3696962)
|
|
|
|
|
|
| |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit e529fc93a203307c1cc9decbd364b8c103c048c1)
|
|
|
|
|
|
| |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 587704316bcb4e0ad55b0dc84af127fb0c9b5828)
|
|
|
|
|
|
| |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit d6226445ffd06372f000cccda7917c2adbd92412)
|
|
|
|
|
|
| |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit c0d420b589faa200f4cbf5fd09597812efae0e77)
|
|
|
|
|
|
| |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 69d6ba21297c48af98dfdc32acb4ef7ccd7bb6f8)
|
|
|
|
|
|
| |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 7a2b606e8c1c5704d3b9d018deeefe5bd7800906)
|
|
|
|
|
|
|
|
|
|
| |
[NSWindow orderFront:] on a hidden window will make it visible. So
raise_sys() will now check if window is visible before this method is
called.
Task-number: 255428
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 9262ee16906fd8e030cd5d2a81d22fe9b791b9f6)
|
|
|
|
|
| |
This matches the logic for the 'lib' template to the one for 'app'.
(cherry picked from commit 9e4f5f2133b542cdf6f32f2fc96dccd864e68420)
|
|
|
|
|
|
|
|
|
| |
Revert parts of adf322c514a5781dcb9ec304d44229fa47d5e8b3 to
get this to work as in 4.5.2 again. What the original
patch fixed, we don't really know..
Reviewed-by: Simon Hausmann
(cherry picked from commit d04c169e424c0feee61763764e841ef132ba359f)
|
|
|
|
|
|
|
|
| |
This reverts commit df47e0d40290f5e40054a9612f75177d9ef8537a.
There is no "private_build" in Qt 4.5
Reviewed-By: thiago
(cherry picked from commit 600cef0aa62dedafac9190809230e01e3b200356)
|
|
|
|
|
| |
Reviewed-By: TrustMe
(cherry picked from commit df47e0d40290f5e40054a9612f75177d9ef8537a)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This introduces an undocumented "phonon_compat" subdir and also adds
it to the INCLUDEPATH when QT += phonon is specified. With this, these
styles of #includes should be supported:
#include <Phonon>
#include <Phonon/Phonon>
#include <phonon>
#include <phonon/phonon>
#include <Phonon/MediaObject>
#include <phonon/mediaobject.h>
Still need to check if the headers get installed during "make
install". I couldn't find where in our code that is done.
BT: yes
Reviewed-By: Trust Me
(cherry picked from commit 0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b)
(cherry picked from commit 94ffd7e298a4ffa0440fd18a30b1823a71c6bb77)
|
|
|
|
|
|
|
|
|
|
| |
It looked strange that the node and its drop shadow was painted on top
of the arrow. Flip the z-axis around to make sure the arrow is painted
on top.
Task-number: QTBUG-4544
Reviewed-by: Gunnar
(cherry picked from commit 33d104723a02297ffef53020d42b789284699534)
|
|
|
|
|
|
|
|
|
| |
Qt Demo seems to assume the executable name is the same as the
directory name, so change the name to all lower case to avoid getting
the message that the example has not been built even when it has.
Found by Black Team.
(cherry picked from commit 6d3764ee563db117d03b9c759e491b70a3c1df7d)
|
|
|
|
|
|
|
|
|
| |
This fixes a regression introduced in Qt 4.5.0, when dragging an item
within a QTreeView it would not call clone() when it was dropped even if
a prototype was set on the QStandardItemModel.
Reviewed-by: Marius Bugge Monsen
(cherry picked from commit e410d2711ae2aba15b9da7b07a4f8e40a50ab9c5)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This issue affects both tool buttons and buttosn
with menus. The problem is that the Windows metric
we were using to calculate the size changed on
Windows 7. It seems not to be the correct metric so it
seems more reliable to use the dpi-scaled constant 12 as we
were doing in common style already. This should make appearance
consistent between the windows versions.
Task-number: QTBUG-4241
Reviewed-by: denis
(cherry picked from commit 1053d8564ca33e18a813e0f0fa1ec1f381e4a937)
|
|
|
|
|
|
|
|
|
|
| |
Fix QGraphicsItem to clear clip path for items with an ancestor that
clips to shape. Added autotest to demonstrate clipping path problem.
Merge-request: 810
Reviewed-by: Alexis
Reviewed-by: Andreas
(cherry picked from commit d14fd301314bcceaf2594a5a18f6d20894c1d353)
|
|
|
|
|
|
|
|
|
|
|
| |
On Windows CE the plugin path is likely to be the same as the
application directory. That's why we must not compare app_location
with the plugins path.
The check app_libpaths->contains(app_location) should be enough.
Autotest: tst_QApplication::libraryPaths
Reviewed-by: thartman
(cherry picked from commit c8816c6da9d265e5ccbf0385280556f9b4c521f6)
|
|
|
|
|
|
|
|
|
| |
Previously a different version of this file was added to each source
package. As the file is now the same for all source packages, it can be
added to the repo.
Reviewed-by: Trust Me
(cherry picked from commit 0d3738134f1797a18475fa043751c168eabb48e8)
|
|
|
|
|
| |
Reviewed-by: trustme
(cherry picked from commit 39ec3f66db65684b32b8c5f35311d6045135c4d0)
|
|
|
|
|
| |
Reviewed-by: Friedemann Kleint
(cherry picked from commit ddf9e97d6700b78711632d352f84c469d000f97b)
|
|
|
|
|
|
|
|
|
|
| |
Cocoa does not allow NSMenu to have multiple supermenu's. If a menu is
added again as submenu, Qt will now disable the menu item or the menu
will not be added at all if it is added again to the menubar.
Task-number: 258822
Reviewed-by: MortenS
(cherry picked from commit faec535829a0e454a6784b0c5c37cb63e7da8f73)
|
|
|
|
|
| |
Reviewed-by: trustme
(cherry picked from commit 9a712c48fb8047c3ed833db7d47382eb072711d6)
|
|
|
|
|
|
|
|
|
| |
The pvr2d.h/wsegl.h headers we ship with Qt (in src/3rdparty/powervr)
are meant for the PowerVR SGX. However, we use an MBX-specific define in
the powervr driver.
Reviewed-by: Jørgen Lind
(cherry picked from commit a62506aae40ede3fd8030312321759f669458909)
|
|
|
|
|
|
|
|
| |
If we define QT_COORD_TYPE, src/testlib doesn't compile for embedded
Linux.
Reviewed-By: joerg
(cherry picked from commit 5a29ceba42840add7a1dcf205c76e39065bee18d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since the width is multiplied into the dash, it needs to be divided out,
otherwise you can get a dashOffset which is greater than the pattern at
the index, and the dash can become negative. This will in turn lead to
passing a negative width to the rasterizer, which at some point will
get cast to an unsigned int and overflow. Depending on the position of
the line and size of the buffer, this will either crash or produce
garbled output.
Task-number: QT-4444
Reviewed-by: Samuel
(cherry picked from commit 603c423fc2ee2b9393e3c288e76354de0e0c1cc7)
|
|
|
|
| |
(cherry picked from commit 9cef27f506e15681f9935a1c00c9df3c6271d5f2)
|
|
|
|
|
|
|
|
|
|
| |
Previously you had to set forward only on non-scrollable datasets
explicitly. This queries ODBC, to determine if it's a scrollable
dataset, and sets forwardOnly to false if it isn't.
Task-number: QT-353
Reviewed-by: Justin McPherson
(cherry picked from commit 18c0fec3afba909faa341c766f31d679892021db)
|
|
|
|
|
|
|
|
|
| |
The test failed because it tried to open a .qm file which didn't exist
in Qt's translations directory. Fixed by running lrelease on the .ts
file and copying the resulting .qm into the test directory.
Reviewed-by: Trond
(cherry picked from commit 59dbb1b7e737713fc650c25a20967ec26cc3ff3d)
|
|
|
|
|
| |
Reviewed-by: Jesper
(cherry picked from commit 93df7f3b8e0e29ee7ed75a5f54222f26387cc793)
|
|
|
|
|
|
| |
Backported d04d67e146bce3d407f992c283d7ab3d0c25d428 and
08b54f274d57e4735d0042e295237f176506433d from 4.6.
(cherry picked from commit 706028b5684de47addcf580599df5fad1b0cd6a3)
|
|
|
|
|
| |
Reviewed-by: Kim
(cherry picked from commit d851010a10c9a75fd8fb165bc239d5d3b805c0b8)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change 979d1d3bbc0c68789edbe93f03464d41d7a8469a requires
qt_format_text() to honor the Qt::TextForceLeftToRight flag. Without
this, the text will be laid out RTL twice, and the output will be
broken. Since printing is done through QPicture, this fixes printing
when the UI is reversed.
Task-number: 261033
Reviewed-by: Trond
(cherry picked from commit 72fc24222ab7f89dc9e606e315ebfb134ba157a8)
|
|
|
|
|
|
|
|
| |
Uses the primary key from the index in the query, not the resulting
location in the modified dataset.
Task-number: 222678
(cherry picked from commit e6f191185d0a80ced3434a8b378b139386c43760)
|
|
|
|
|
| |
Reviewed-by: Justin McPherson
(cherry picked from commit b2d7bcf1e77e8b9bc8fc1b40777907d7a8d47c09)
|