| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (377 commits)
Correct last right bearing in boundingBox(glyphs)
Make sure propagated font in QGraphicsWidget can be set on a QPainter
Apparently QPen::brush() can't return a NoBrush for a NoPen.
Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
use QFile:map instead of ::mmap
Do not use global static const references to objects
Revert "Refactor blend_transformed_bilinear to simplify the blend type checking"
Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.
Refactor blend_transformed_bilinear to simplify the blend type checking
Note RTL behavior changes in docs and changelog
Implement qt_memfill32 with Neon.
Implement the composition mode Plus with Neon.
Fix the broken unicode detection of ODBC driver.
Doc: Fixed qdoc warnings.
Doc: updating getting started docs - not finished
Make it possible again to build Qt without webkit
Doc: fixing creator bugs, removing menus and textbox in the header
Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
Doc: Fixing overlapping text in header list
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Commit 07880542ecc479807c23c5646d263135240822ff introduced regression to
QFontMetrics::boundingRect and QTextEngine::boundingBox on FT, XLFD and
QPF font engine. Because on these platforms, rightBearing of the last
glyphs is already removed from the width returned in glyph_metrics_t.
Subtracting that rightBearing twice will cause the resulting boundingBox
smaller than expected.
This patch fix this by removing last right bearing accounting code from
generic QTextEngine::boundingBox, instead, we put it into font engines
that need them: QFontEngineWin, QCoreTextFontEngine, QFontEngineMac,
QFontEngineS60 and QFontEngineQWS. So that the resulting width should be
correct on all platforms without introducing any performance penalties.
Task-number: QTBUG-6854, QTBUG-12950
Reviewed-by: Eskil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In QWidget and QGraphicsWidget, propagating fonts blank out the resolve
mask, mainly to help in determining inheritance. This means that when
the font is set on a QPainter with device and therefore resolved against
the device font, none of the attributes in the font will take presedence
and the font will essentially just be ignored. For QWidgets this has not
been a problem due to the fact that the painter is opened on the widget,
getting the propagated font as its device font. For QGraphicsWidget,
however, the QPainter is opened on the viewport and the viewport's font
will therefore override the propagated font when it's passed into
setFont(). To fix this, we need the font returned by
QGraphicsWidget::font() to contain the resolve mask of the inherited
parts of its font as well. This is done last minute to avoid messing
up the rules of inheritance in the QGraphicsWidget tree (problem arises
e.g. in hierarchy A -> B -> C and a font is set on B which should override
the font C has previously inherited from A.)
Task-number: QTBUG-13188
Reviewed-by: Lars
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There are explicit tests in qdatastream for this. IMO it's wrong,
wrong, wrong, but it's currently abused in the SVG module so we can't
change it.
Reviewed-by: Gunnar
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (374 commits)
Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
use QFile:map instead of ::mmap
Do not use global static const references to objects
Revert "Refactor blend_transformed_bilinear to simplify the blend type checking"
Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.
Refactor blend_transformed_bilinear to simplify the blend type checking
Note RTL behavior changes in docs and changelog
Implement qt_memfill32 with Neon.
Implement the composition mode Plus with Neon.
Fix the broken unicode detection of ODBC driver.
Doc: Fixed qdoc warnings.
Doc: updating getting started docs - not finished
Make it possible again to build Qt without webkit
Doc: fixing creator bugs, removing menus and textbox in the header
Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
Doc: Fixing overlapping text in header list
Use Ctrl rather than Alt for switching tabs in the demo browser
Doc: add link to new gettings started to index.html
Doc: Fixing bug involving header misplacement in Creator style
...
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (374 commits)
Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
use QFile:map instead of ::mmap
Do not use global static const references to objects
Revert "Refactor blend_transformed_bilinear to simplify the blend type checking"
Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.
Refactor blend_transformed_bilinear to simplify the blend type checking
Note RTL behavior changes in docs and changelog
Implement qt_memfill32 with Neon.
Implement the composition mode Plus with Neon.
Fix the broken unicode detection of ODBC driver.
Doc: Fixed qdoc warnings.
Doc: updating getting started docs - not finished
Make it possible again to build Qt without webkit
Doc: fixing creator bugs, removing menus and textbox in the header
Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
Doc: Fixing overlapping text in header list
Use Ctrl rather than Alt for switching tabs in the demo browser
Doc: add link to new gettings started to index.html
Doc: Fixing bug involving header misplacement in Creator style
...
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This could cause some strange things to happen in our fallback code
used for e.g. printing, since the brush might be valid and e.g. contain
alpha values etc.
Task-number: QTBUG-12263
Reviewed-by: Gunnar
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: janarve
|
| | | | |\ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
(cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a)
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(cherry picked from commit b83f3a98fe5688872b4bd9a871e544951cb33e29)
Conflicts:
doc/src/getting-started/gettingstarted.qdoc
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Remove the QT_CONFIG line from the qt_webkit_version.pri file in Qt,
because it is only meaningful for separate builds of WebKit.
(Real fix is in the import script that takes care of always
removing that line)
Task-number: QTBUG-12456
Discussed-with: axis
(cherry picked from commit 4cd413970b18125885ce60d82a4ad06bce6395a5)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(cherry picked from commit 4aafc4e55e0906be0cc39911b2c1a4ffe71c4d91)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
dependencies in the upstream branch.
Rev-by: MortenE
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(cherry picked from commit ccb77caba466fe0e4d28a809129513cefdbd5575)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Alt+1, Alt+2, etc produce actual symbols on some keyboard layouts,
for example Norwegian, which prevents you from typing the @ symbol.
Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
(cherry picked from commit 5b177dd50d1ea0eb9130c631757a687782a23cd3)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(cherry picked from commit 613ab517f46085580e81684cd5072f8c90fe84d5)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-11408
(cherry picked from commit 997e4161cf937aa34a16bb2e708fa1bc7909355f)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The reason is that we tried to fix the stacking order of child windows
while we fixed a crash. But the patch turned out to break an auto-test
Reviewed-by: prasanth
(cherry picked from commit 749ad26d255327c9fa3fe857a30983cc6dfef0d9)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6,
which broke fill / outline consistency, and when trying to fix that
by rounding the fill the same way that broke rendering in Creator.
Unfortunately the X11 paint engine is too sensitive to changes, there
have already been tons of patches to make it as consistent as possible.
It's simply not possible to get the same rounding for both fill and
outlines and at the same time have consistency between fill and outline
(no holes or fill outside the outline), while using the integer based
Xlib rendering API. Hopefully in 4.8 we'll switch to raster and the X11
paint engine will be a legacy.
Reviewed-by: Trond
(cherry picked from commit 041a68007413a20a9a9c97d0f2f04f9e03428f67)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit ff405f5623d7ed18c881c097368e3e9afd2e9443.
Reviewed-by: Trond
(cherry picked from commit 3014b427aa8700890f9bd8ea2a0300fc152bf3d2)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6 broke outline / fill
consistency in the X11 engine. Since the positioning of lines is more
important we'll round the fill coordinates the same way.
The bug was visible in the filltest.qps arthur test.
Reviewed-by: Gunnar Sletta
(cherry picked from commit ff405f5623d7ed18c881c097368e3e9afd2e9443)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
do it in qt_config.prf instead of in the autogenerated qconfig.pri
files. this is waaaay more elegant, and allows us to easily use the
magic in that file which avoids loading qt configuration from the qt
install dir while building qt itself.
Reviewed-by: joerg
Reviewed-by: Simon Hausmann
Task-number: QTBUG-12698
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The crash happens in the Nvidia driver in glXReleaseTexImageEXT when
scrolling the corkboard using the mouse. To work around it we detect the
Nvidia driver versions where this is known to be a problem and skip
using the texture from pixmap extension in those cases.
Task-number: QTBUG-12914
Reviewed-by: Trond
(cherry picked from commit a76b8bf67696ae69888cc6237417e7c8f07f8da6)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The reason is the cocoa method that adds a window as a child of another,
it ends up showing both the parent and the child window regardless.
And this could in some cases also cause a crash.
So we therefore need to be careful when calling that function, and be
sure that the parent is actually visible. In addition, addChildWindow
reset the stacking level of the child window, and made e.g. normal
child windows pop in front of tool child windows. This could easily
be seen in e.g. Designer.
Task-number: QTBUG-12866
Reviewed-by: prasanth
(cherry picked from commit cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(cherry picked from commit 167b63d2250e7923d7b660076a80e82af07d9cdb)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-12840
(cherry picked from commit d904fe2273be5d39b54b987eef6b9cc0d1b85c4b)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-12771
(cherry picked from commit e8d3e8e0b93271bb41fcdc264fc10ec59be5aa20)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
These are owned by the root and must not be destroyed by child lists.
Task-number: QTBUG-12771
Reviewed-by: Bea Lam
(cherry picked from commit 4026b2c7bc91f8f25f73b182687d5d2bed823217)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In MainWindow::deleteItem, if there is arrow selected, we need to clean
up the items from this arrow. We need to delete them first so there is no
arrow in the list anymore when we calls removeArrows (which before,
deleted arrow that were possibly in the list, resulting in crashes)
Also avoid leak by giving parents to objects that needs it, and destroying items.
Reviewed-by: Geir Vattekar
Task-number: QTBUG-12753
(cherry picked from commit 5dedcd3c4cac993949295d109804a8f7cc3a5b0a)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QTBUG-12729
(cherry picked from commit ee7c3b576ced47d3b68da1913cdf6995144bddd2)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The problem was in the toggleDrawer function. We were not checking the
status of the last transition before setting the new transition, so
all the transition were treated as non-intentional.
Task-number: QTBUG-11373
Reviewed-by: Prasanth
(cherry picked from commit 725d8e061ededee9a5ddf0914aabd0f6aa2ee741)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QT-2027
Reviewed-by: Joona Petrell
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number:
Reviewed-by: Martin Jones
(cherry picked from commit 875d5e374dce3dd7d7cce87b55e277e8e9497044)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number:
Reviewed-by: Martin Jones
(cherry picked from commit cf0f53ecefd6914d533ffea057748480e3e5bd33)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Previously check to remove files from deployment in case the deployment
target location was the same as the source location was done using
QFileInfo equality, which resolved to true when file didn't yet exist
at the time qmake was run. Changed the check to compare absolute paths
instead.
Task-number: QTBUG-12879
Reviewed-by: Shane Kearns
(cherry picked from commit 448a8603bb0609bf880a2c1b92b26c2005e1cf63)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Dependencies got generated wrong in Makefile because sis is always
created in the .pro file directory but dependency included path
that was in TARGET.
Task-number: QTBUG-12884
Reviewed-by: Shane Kearns
(cherry picked from commit 434ce6748ea7f082357b6d7ab542c9fa2285bd4c)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If QProcessManager destructor is ran as part of global static cleanup,
manager thread will most likely be terminated by kernel at that point,
so trying to delete QProcessActives and QProcessMediators will panic as
they will still be active. They can also no longer be properly canceled
as the thread is already gone. In case manager thread has already died,
which implies that process exit is imminent, we simply do nothing and
let the deletion of the main heap at process exit take care of stray
objects.
Task-number: QTBUG-11218
Reviewed-by: Janne Koskinen
(cherry picked from commit 7cfc9f2245162944f3d9a29ad73cd93e2bcf197f)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(cherry picked from commit 13d35e19a2bf78dd6a63b35f06a07d2b6e9c67c4)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Modal dialogs were sometimes hidden behind other normal windows
on screen. The reason was that, upon going modal for a window, we
actually resat the stacking level on the window in a faulty
attempt to respect any stays-on-top window flags. This patch
makes sure we avoid doing that, and at the same time, ensures
we don't reintroduce the original bug as well.
Task-number: QTBUG-12841
Reviewed-by: cduclos
(cherry picked from commit 6d0d767e63df3c997d6d7a8cb6cd4bf8c0dfc835)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Every time [NSApp setMainMenu:] is called, Cocoa will add the 'Special
Characters' item to the 'Edit' menu. Before adding a new entry it will
make sure that menu items list doesn't contain an item with the selector
'orderFrontCharacterPalette' & a 'nil' target. We need to return the
index for the first entry (we have QCocoaMenuLoader as target).
Task-number: QTBUG-12842
Reviewed-by: Denis
(cherry picked from commit b52da4ab2179079a6aff95891786d2f6598048b5)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(cherry picked from commit 2dfd16e8a138da9d903b31ef461331016d16ec5b)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Flags allowed are now -creator and -online. -creator is
the default.
(cherry picked from commit 03d9d3cf641c8dde22a903870ac2b6e58ada6eec)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-nr: QTBUG-12388
(cherry picked from commit c1ce7b4b01c1049c61881bb7d701ed68b92a401b)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also emit the signal at the very end, so people can rely on the resize
event to adjust some stuff in their item.
Reviewed-by:yoann
(cherry picked from commit 3ee89bc0830f69d44f272eff5a0c886bff33c92e)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ALSA can return a list of one empty item when no devices are available.
Task-number: QTBUG-12690
Reviewed-by: Andrew den Exter
(cherry picked from commit baf8eabd2c647d6ba2bf0a9dc5103f4726808c3d)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(cherry picked from commit 653f180d4697e0c7ec1c58022622d5d140e7fda8)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Changes to .pro file weren't previously noticed and therefore
qmake wasn't rerun. Qmake command itself was also incorrect.
Task-number: QTBUG-12716
Reviewed-by: Shane Kearns
(cherry picked from commit 142ce4d38094f1588b04758a6f9ff6787a784fe3)
|