| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The RenderRule for the stylesheet has the correct font information, it
just wasn't being set on the painter that draws the label.
This is a backport of the Qt 5 commit:
9ad768fd1999780df18551151b9d9fa9c354131c.
Task-number: QTBUG-8990
Change-Id: I4857d6e17b62980782ca7bfdfd0a571a9950f635
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since we're in the 21st century, we set QCommonStyle to return true
to the SH_Menu_SloppySubMenus style hint. This unlocks all the logic
already available in QMenu.
This is a backport of I134c87e348d98d1f46055e0bfef2b4a4a3d2993a
from qt/qtbase and includes some previous enhancements.
Task-number: QTBUG-20094
[ChangeLog][QtWidgets][QMenu] Enable sloppy submenu mouse navigation
Change-Id: If4141a3d849123850e40af92ac5aede9ed767bdf
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The old code tried to check the 2nd parent for inheritance from
QAbstractItemView. This also triggers for line edits on a QDialog parented
on the item view. Introduce convenience function that checks for
top levels in the chain.
Task-number: QTBUG-37504
Change-Id: I932f8efdb4764e9b1eea84c802bf7e8718338e1d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
(cherry picked from qtbase/176342e70a1ba7864a5b5dac14d12d4091ef5bd9)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is additional fix for bug 23569.
Previous fix (SHA1 7fcf1cf674d09d9dd1d41e2913252017f1d599ca) is not enough.
QGtkStyle was still crashing with old gtk (< 2.14)
in drawComplexControl () function.
Bug was reproducible on CentOS 5.x and Red Hat 5.x.
Current patch makes the same check as in commit mentioned but in another
line of code.
Task-number: QTBUG-23569
Change-Id: I261b61bc93ccaada879ed02ad4d0bef62935335b
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Harri Porten <porten@froglogic.com>
(cherry picked from qtbase/7df3321f934e5bd618e2ad00bf801f2b7edd31df)
|
|
|
|
|
|
|
|
|
|
| |
[ChangeLog][QtWidgets][QMenu][Windows] Correctly use text color set by style sheet for menu items.
Task-number: QTBUG-36142
Change-Id: I142f2fd82164771b45bf599a6afa1121fcfd2187
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
(cherry picked from qtbase/b152b425f74788b2f2845fb7d1a5032d86b8746d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
action.
The gutter position was hardcoded to 28 which fits when drawing
on the QMenu with a left margin of 3. It became offset when drawing
on a custom widget with no margin. Calculate position relative
to margin for left to right.
[ChangeLog][QtWidgets][QMenu][Windows] Fixed position of menu gutter when using a custom widget action.
Task-number: QTBUG-36218
Change-Id: Ibb34a9fba2bab7257482b80d2e51e76a9755345c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/a5c288ea5675a382edf0b3ecae42f461a22a7303)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently a QListView with wordwrapping activated will wrap the text
only to the width of the icon even if the grid size is bigger. With this
patch the option rect is now updated to match the grid size if valid
and the style uses it to determine the correct size when wrapping
[ChangeLog][QtWidgets][QTBUG-4714] Use the grid size for wordwrapping
when available in icon mode
Task-number: QTBUG-4714
Change-Id: I2cb63809d3ee8bd262f38bc11de91df9ff5cf237
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
(cherry picked from qtbase/a761be2fb2191215426f904cb03df0e966214531)
|
|
|
|
|
|
|
|
| |
This is a regression introduced by a1eaf0169f041f599895fac90570df601559a526.
Task-number: QTBUG-34540
Change-Id: I3944a92f5119e0ec7c435b5b36ed4bc3d7361888
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
| |
Change-Id: I114483273db0f9ffe0527b4a3e4cd881375a3448
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
(Cherry-picked from qtbase/61948f84da12432b9b8b178875a86f54fef12e32)
Task-number: QTBUG-26503
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Change-Id: I1ff92e9f2825e9c0171dbbf5425bb2c997d9cf5a
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-31739
(cherry picked from commit 0a55499c9af9a4b0a98a12a8aba82c3764fa5994)
Change-Id: I1d2d1bb5ca7a19a8c42f11e944e8339e56df6e4b
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add QGtkStyle::getIconThemeName() static helper function
(which uses GtkSettings to retrieve the theme name) and use it in
QGuiPlatformPlugin::systemIconThemeName() when desktop is GNOME.
In modern distributions like Debian and Ubuntu, the
/desktop/gnome/interface GConf schema is no longer installed,
so the old method for retrieving icon theme name no longer works.
Qt 5 already uses GtkSettings for this thing, although the code
is in a different place.
Change-Id: Ib13d4809b55dd55dc1fa0bc2c4b1552f13feb030
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
This makes QGtkStyle working again on Debian experimental
and Ubuntu 13.04, where getThemeName() returns empty value.
Backported from QtBase b72aa1cad30a44b1.
Change-Id: If4cc822970088a5fb31aa28d9951db1efc0bb4fd
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The purpose of PE_Frame is to draw the frame, not the background. The
old code tried to check whether a custom base brush was set, and
otherwise let the theme draw the background. That didn't work together
with CSS background images. This change removes the background drawing
from PE_Frame, and let's PE_Widget to draw the background using the
base brush that defaults to a color fetched from the theme.
Task-number: QTBUG-24783
(cherry picked from qtbase/f1e681bed21e131864fe1e1c91679f7a56b06823)
Change-Id: Ief256d1d5861abc95dedf0b5d0a4f8e338c48941
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some implementations seem to not have the gtk_adjustment_configure
function implemented so we check for this so that there is no problem
when it tries to use it.
Task-number: QTBUG-23569
QTBUG-25760
Change-Id: I777ce09268f86907f3da3cede408c9a41be566cf
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Karim Pinter <karim.pinter@digia.com>
(cherry picked from qtbase/7fcf1cf674d09d9dd1d41e2913252017f1d599ca)
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
We resort to custom Qt rendering when selected since it looks better
than using Carbon's HITheme engine.
This is a backport of Qt 5's 65b39b3cdcdfe175d80ccf9428168ed51be77fd8,
and also reverts commit f7bba6cc700f5f6b1ff6a40b8c475924de206022.
Change-Id: I684db730f05bead16e16a0d1c8f20164e9fc70b7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adding QCheckBox, QComboBox, QLineEdit etc. into an HBox layout or grid
layout makes the layout look like a snake's trail. Fixed the positioning
of these widgets to make the layouts visually more appealing.
Updated qmacstyle auto-test accordingly.
Task-number: QTBUG-13635
Ammended-by: Gabriel de Dietrich
Ammended-by: Liang Qi
Change-Id: Ic12346f764d8092292b8388f50d184b37d7cef5f
(cherry picked from qtbase/8b6de4677142cab41790ca50ce6c7f1efbab5de8)
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-27992
Change-Id: I4ed5661cfe0d0a10143224b73fbad6fac4927a37
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/5223e7eb27dc15f8428aeb66dd8c57098dedce58)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The line to restore it was missing, and the leftover variable
caused a warning, which was removed in
abe5a0a432116963d22c4ef501a4dfd2393d66fb .
Task-number: QTBUG-27828
Change-Id: I00b8b89b07bec38a1660c3a9c61220b6d0d7eb48
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
(cherry picked from qtbase/96ebbad5f03d6db5fa81f284ccbdaf4b6259c27b)
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QWindowsVistaStyle::drawPrimitive() method was trying to draw the
pixmap for an item in an item view even if the section width was zero
or less then zero. This resulted "QPainter::begin: Paint device
returned engine == 0, type: 2" error.
It's now checked that the width and the height of the section is
greater than zero before creating the painter.
Task-number: QTBUG-26047
Change-Id: I36dd2792fd505be773951e5ac36b0e3362ec2292
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 929e934969c621d7c1773e4233c14d358de4d385)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
| |
Change-Id: Id9bdb0199f926d1a518a94080285f96f0810cf92
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-23072
Change-Id: I296b46af23420b24fa5460b9660e33bf203ea29f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"
Fix QDockWidget titlebar button positioning on Mac OS X
Fixed memory leak in Windows Vista style widgets
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Move the QDockWidget close and float buttons from the right end of the
dock widget title bar to the left end to avoid Mac App Store rejection.
Task-number: QTBUG-19493
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The animations are now deleted in destruction of the Vista style.
With the previous implementation the animations were not deleted for
instance if you move mouse cursor off from a widget with hover
animation (like QPushButton).
Task-number: QTBUG-21532
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed wrong QGroupBox check state
Added base 10 to be used with QIntValidator.
Mac: Fix the color of check marks in menus with stylesheet
Russian translation update
Don't directly access QList contents
Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag
|
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-16989
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Morten Johan Sorvig <morten.sorvig@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Repaint QProgressBar when minimum or maximum changed
Fix QProgressBar causing timer event spam
Compile fix for Mac OS X 10.7 with 10.6 sdk
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On Windows you will get a lot of timer events if you use QProgressBar
widget. This is because QWindowsStyle uses a timer to animate a
progress bar with unknown state (min and max values both zero). The
issue was fixed by starting the timer only if needed.
Task-number: QTBUG-10501
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|/
|
|
|
|
|
| |
The m_animations contents were never deleted.
Task-number: QTBUG-22603
Reviewed-by: Sami Merila
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian configuration parameter change for linux building
Improve patch_capabilities script output.
Fix QtSql autotest server addresses
Update SQLite version number in legal document
Update SQLite version mentioned in licence document
Symbian Linuxification building case changes
Fix FTP example to handle failure to open network session
Use QBasicAtomicInt as a static variable
FTP - fix interoperability issues with SIZE command
QS60StyleAnimation exception safety
Catch potential throw in ~QSymbianControl
Fixed access to null threadData in ~QObjectPrivate
Fix the build for makefile build system of Symbian
Symbian - fix compile error when default configured
|
| |
| |
| |
| |
| |
| |
| | |
Changes the libraries to match the case of files for building
Symbian in linux.
Reviewed-by: Miikka Heikkinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QS60StyleAnimation had a number of exception safety problems.
- Exceptions from QS60StyleAnimation/V2 could panic a TRAP harness.
- Pointers could be uninitialised on exception in constructor.
Problems solved by switching to QScopedPointer and simplifying the code.
Task-number: QTBUG-4871 incidental finding
Reviewed-by: Sami Merila
|
|\ \
| |/ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There were a number of places in QtGui where doubles were used in
expressions due to the use of floating point constants in the
code. Many of these constants are now constructed as qreal, removing
the use of double operations where unneeded.
These changes have been limited to constants that have exactly the same
value whether double or float, to ensure that precision errors are not
introduced.
This should not affect any of the desktop platforms where qreal is
double. On Symbian, where qreal is float, appropriate autotests have
been run.
Task-number: QTBUG-4894
Reviewed-by: Sami Merila
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-19110
Merge-request: 2687
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
|
|\ \ \ \
| | |_|/
| |/| | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 1272
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the initialization guard must be set after the initialization is done;
for the code assumed to be only executed in a single thread, this change was done
just for consistency - in order to avoid similar issues by copy-pasting in future
Merge-request: 2655
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
|
|\ \ \
| |/ /
| | /
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits)
runonphone: Include USB serial ports on OS X for CODA, too
runonphone: Implement traceswitch support for coda
Fix missing clean up stack panic for a new thread in Symbian
Regression in QS60Style when drawing webview scrollbars
Cleanup qwidget_s60.cpp
Fix panic when global QSettings instance needs flusing at app exit
Fix uninitialised variable in temporary files
More accurately determine bearer type for symbian GPRS/3G
Add documentation for Symbian QSettings locations and security
Update QDesktopServices openUrl() documentation on Symbian OS
Mark binaries as SMPSAFE in Symbian
Fix "sbs -c tools2 --what" output for Qt.
Update environment.prf
QS60Style: Make spinboxes and lineedits slightly taller
runonphone: Add a missing space between a message and the file name
runonphone: Allow overriding the temporary sis file name
Fix QIcon auto-tests for Symbian
Add a cast to moc cpp generator to remove armcc warnings
Fix qt.conf for Symbian to use $${EPOCROOT}
Remove few unused variables.
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QWebviews draws scrollbar background with bright green.
This is regression caused by QS60Style change SHA
7dfa50a9b97d28813341329a55aa1a4b5a7de527. This SHA changed theme background
creation to happen just before drawing. Unfortunately, web widgets have
slightly different palette than non-web widgets, so the style didn't catch
the incorrect background texture when painting. Thus, the background was drawn
with initialized color (green).
Task-number: QTBUG-21463
Reviewed-by: Miikka Heikkinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Make spinboxes and lineEdits as tall as comboboxes are. This makes these
components to look more like native components. Since spinbox frame width
was previously zero, changing the value revealed some button positioning
issues.
Task-number: QT-4175
Reviewed-by: Miikka Heikkinen
|
| |
| |
| |
| |
| |
| |
| | |
Merge cf2f72f4f61f3a9e0e7573379c33bb341eeba7be caused QS60Style.cpp
to pick up unrelated changes from Qt4.7 branch.
Reviewed-by: Miikka Heikkinen
|