| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
| |
Added ifdef inside qt_tildeExpansion function to use correct
version of getpwnam_r depending on _C_POSIX_SOURCE version
on Solaris platform.
Task-number: QTBUG-21451
Merge-request: 1380
Reviewed-by: ossi
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
When Qt is configured for static build, importing static plugins is
supposed to work as described in docs:
http://doc.qt.nokia.com/latest/qtplugin.html#Q_IMPORT_PLUGIN
This commit updates the qmake mapping for predefined Qt plugins, so
that Qt plugins are automatically found when QTPLUGIN keyword is used.
Task-number: QTBUG-18609
Merge-request: 1391
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
First, #ifdef'ed out getpwuid_r() and getpwgid_r() usage since users/groups support is not in in single-process Posix mode.
Also, correct a typo and add missing files to io.pri.
Update documentation to disable libtiff which won't compile until ibtiff itself is updated, and add back -no-exceptions in the sample command line. And add a line to compile host tools.
Add a dummy QT_OPEN_LARGEFILE definition in qplatformdefs.h since there is code that requires it.
Move definition of getGlyph() after the definition of qHash(GlyphAndSubPixelPosition).
Merge-request: 2686
Reviewed-by: ossi
|
| |
|
|
|
|
|
|
|
|
| |
This solves a build issue on Solaris as the symbols were missing so
they are now added in the expected way after discussion with the
Nokia developer who approved the patch originally for winscw.
Task-number: QTBUG-21523
Merge-request: 1389
Reviewed-by: ossi
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Disable autotest broken by the change to QCache in 7ab0bed
Generate glyphs in un-transformed coordinate system.
Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
Reset trailingSpaces in relayout
Prevent QPixmapCache potentially growing indefinitely.
Allocate 16-byte aligned memory independent of platform for raster pool.
Fix trailing spaces problem by not adding it to QScriptLine.length
Fix RTL layout for fonts when non-printable character has an advance
Fix regression in tst_qrawfont
Make it compile on mac
Fixed compiling error in qvfb.
micro optimizations
fix "comparison between signed and unsigned" warnings
on windows, don't resolve the gdi32's symbols for each QRawFont instance
fix typo in the docs
QRawFont: add missed operator !=
optimize QGlyphRun's operator == a bit
QGlyphRun: make operator != inlined
QGlyphRun: don't detach if the decoration wasn't actually changed
QPA event loop: Set a timeout != 0 if there are no timers.
|
| | | |\ |
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (120 commits)
Disable autotest broken by the change to QCache in 7ab0bed
Generate glyphs in un-transformed coordinate system.
Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
Reset trailingSpaces in relayout
Prevent QPixmapCache potentially growing indefinitely.
Allocate 16-byte aligned memory independent of platform for raster pool.
Fix trailing spaces problem by not adding it to QScriptLine.length
fix build for desktop
Dragging in nested views no longer works as expected
Fix the build with -qtnamespace configure options
Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)
Fix implicit height not growing when pre-edit text wraps.
Removed the unnecessary dependency of the QtHelp module on the QtXml one
Modified \since command behavior slightly to handle project and version.
Added an additional check to workaround an issue on Windows.
Fix leak in State element.
Fix leak in bindings created by PropertyChanges.
Revert readonly BorderImage::sourceSize change
URLs used with scheme handler use appropriate encoding for scheme
Update license headers
...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: trustme
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Avoids rounding issues with very large coordinates.
Task-number: QTBUG-21262 - QRasterPaintEngine & QFontEngineFT - fonts corrupted when scrolling to the bottom of long texts
Reviewed-by: Eskil
Signed-off-by: Aleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-21162 - Letters get truncated when font size=72 and set to Italic
Reviewed-by: Eskil
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: TrustMe
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QPixmapCache has until now refused to throw out shared pixmaps, i.e.
ones that still have shallow copies lying around. This leads to problems
when someone inserts two shallow copies using different keys, causing
the cache itself containing multiple shallow copies and thus forever
refusing to throw out those entries.
It's rather easy for this to accidentally happen in a user application
since QPixmap::load() or QPixmap(const QString &fileName, ...)
automatically cache the pixmap in the QPixmapCache, thus if the user
then calls QPixmapCache::insert() on the same pixmap or a shallow copy
it is locked in the QPixmapCache forever.
The only reason for not throwing out a pixmap that's shared would be to
prevent re-loading a pixmap from file when a user has a direct reference
to it in his application, but in that case the user is unlikely to
re-load the pixmap from file in any case. Therefore it seems the best
fix is to get rid of this limitation.
Task-number: QTBUG-21359
Reviewed-by: John Brooks
Reviewed-by: Olivier Goffart
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fixes crash on MIPS (see original merge request
https://qt.gitorious.org/qt/qt/merge_requests/1366).
Reviewed-by: Olivier Goffart
|
| | | | | |\ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
It seems to be the only sane way to fix it. Previous attempts to
fix it by compensating the trailing space width all failed in some
cases, one of the trickiest is when we are having embedded LTR text
that has trailing spaces in a RTL paragraph.
In this patch we leave line.length not including the trailing space
length, but saving it to a separated variable, so that we can always
add it back when needed (QTextLine::textLength() for instance).
It fixed all the problems in different alignments of both RTL and
LTR text. And no regression is found yet.
Reviewed-by: Eskil
|
| | | | | |\ \
| | | | | |/
| | | | |/|
| | | | | |
| | | | | | |
Conflicts:
tools/qvfb/qvfbshmem.cpp
|
| | | | |\ \ \
| | | | |/ /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fix RTL layout for fonts when non-printable character has an advance
Fix regression in tst_qrawfont
Make it compile on mac
Fixed compiling error in qvfb.
micro optimizations
fix "comparison between signed and unsigned" warnings
on windows, don't resolve the gdi32's symbols for each QRawFont instance
fix typo in the docs
QRawFont: add missed operator !=
optimize QGlyphRun's operator == a bit
QGlyphRun: make operator != inlined
QGlyphRun: don't detach if the decoration wasn't actually changed
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If a non-printable character has an advance, we would lay out the text
as if the character was part of the output, and then ignore the
character later when the text was rendered. To fix cases such as this,
we take the dontPrint attribute into consideration when adjusting the
advances.
Task-number: QTBUG-21347
Reviewed-by: Eskil
Reviewed-by: Lars
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change 4d8cd11179e6cca162efe650d308124dc7aefb14 broke QRawFont on
Windows by removing some code. After the font has been renamed, we need
to use the new font tables rather than the old ones for registering the
font in the system.
Reviewed-by: aavit
|
| | | | | | | |
|
| | | |\ \ \ \
| | | |/ / /
| | |/| / /
| | | |/ / |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 1324
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
use an inlined version of isValid() everywhere;
don't detach where is non required;
get rid of extra checks where possible
Merge-request: 1343
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 1343
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 1343
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 1343
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 1343
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 2652
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 2652
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 2652
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| | | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (69 commits)
Fix conversion of QAbstractItemModel::rowsMoved() parameters
Do not unconditionally use pkg-config in .pro files
Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
In 4.7 QFileInfo::absolute(File)Path returned clean paths
Porting the QTBUG-21084 fix to 4.7.4
ret is an "internal" path, no need to re-process it
We prefer capitalized drive letters, make it so sooner
Don't second-guess the "engine"; call cleanPath on absolutePaths
Compare non-canonical paths before falling back on expensive computation
Fix QDir::operator==(const QDir &) const
Fixed use of deleted object in XmlPatterns EvaluationCache
Check if bridge plugin vector is still valid.
Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list
Crash when creating scroll bar skin graphics on S60 (debug only)
Fix memory leak in ListModel custom parser
QS60Style omits drawing theme background in some Symbian SDKs
...
|
| | | | |\ \ |
|
| | | |\ \ \ \
| | | | |/ /
| | | |/| |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
QPA event loop: Set a timeout != 0 if there are no timers.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Leaving it at 0 leads to event checking with 100% CPU even though we
know that there are no events.
Acknowledged-by: jlind
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
find qt.conf more reliably
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Merge fixes for QDir::operator==
QSslCertificate: block all DigiNotar (intermediate and root) certs
Restore Qt4.7 behaviour of QFileInfo::absolute(File)Path
Fix compile error on MSVC2008
Fix comparison of absolute, unclean paths in QDir
Wrap calls to Sequence::push_back
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
There were two fixes in 4.8 which each fixed a part of the problem.
Comparing canonical paths is more correct, but is only possible where
both directories exist. If neither directory exists, then compare
absolute paths instead.
Changed a regression test, because /tmp is a symbolic link on MacOS.
I.E. "/tmp/.." is canonically "/private" and not "/" as expected.
Task-Number: QTBUG-20495
Reviewed-By: joao
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
and do not only check leaf certificates, but all intermediates and
the root. Tested manually with the cross-signed intermediates.
Reviewed-by: Richard J. Moore <rich@kde.org>
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Many applications relied on the undefined behaviour that the
filesystem engines returned clean paths (despite the documentation
stating that they may not), and consequently suffered regressions with
Qt 4.8.
Unix paths are once again cleaned if necessary.
Windows/Symbian paths were already cleaned, but now use the utility
function to check if a path is dirty, to avoid duplicated code.
Task-number: QTBUG-19995
Change-Id: If8c18469f149291c9d079ae3da23bc2087bbd49a
Reviewed-on: http://codereview.qt.nokia.com/4154
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I4f6192b9db601076688b52bfd794ea80a7346729
Reviewed-on: http://codereview.qt.nokia.com/4153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QDir::operator== was creating a clean absolute path for comparison
purposes if the original path was relative.
However original absolute paths were trusted, even though they could
be unclean. Now they are checked for cleanliness first.
Task-Number: QTBUG-19995
Task-Number: QTBUG-20495
Change-Id: I047a1a40ae5151e4604085e4ac87f30a4e4979c4
Reviewed-on: http://codereview.qt.nokia.com/4099
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
In C++11 push_back is overloaded to support rvalue-references,
void std::vector<T>::push_back(const T &);
void std::vector<T>::push_back(T &&);
so attempting to get the address for push_back is ambiguous.
Instead of hardcoding the function signature, the better and more
general solution is to allow the compiler to do the required overload
resolution itself, also allowing for implicit conversions to take place.
Task-number: QTBUG-18996
Done-with: Liang Qi
Reviewed-by: Olivier Goffart
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
qmake vcxproj generator: fix XML conversion for build events
|
| | | | |_|_|_|_|/
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-20419
Reviewed-by: ossi
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix double click and drag not extending word selection.
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
mousePressed isn't set on the second press of a double click and so
can't be used to determine if all selections should be skipped. Instead
skip only the single click and drag selections if mousePressed is false.
Change-Id: I5e7ba033f38b0f9b98fdca5c61a8548f92991601
Task-number: QTBUG-20925
Reviewed-by: Martin Jones
|
| | |\ \ \ \ \ \ \ \
| | |_|/ / / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Split CFLAGS from pkg-config properly
Ensure that the proxystyle is used over the style's own functions
runonphone: Add a missing space between a message and the file name
Perl check for windows configure.
QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
QSettings: use the common appdata dir when bootstrapping qmake on win
Replace explicit surrogate handlers by inline methods of QChar class
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Dragging in nested views no longer works as expected
Fix implicit height not growing when pre-edit text wraps.
Fix leak in State element.
Fix leak in bindings created by PropertyChanges.
|
| | | |\ \ \ \ \ \ \ \ |
|
