| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Merge-request: 2503
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* QChar::NoCategory is a `fake` category since there is no relevant equivalence
for it in the Unicode specs; the default category for
invalid/unassigned codepoints is QChar::Other_NotAssigned.
QChar::NoCategory already caused some troubles in the past, so let's remember
that lesson and do not repeat this mistake anymore;
* QChar::Unicode_Unassigned == 0 and thus it is less than any other QChar::UnicodeVersion value
that makes test for unassigned (in some Unicode version) codepoints a bit more complex
(eg `if (v == QChar::Unicode_Unassigned || v > QChar::Unicode_3_1)` to check
if some codepoint is unassigned for Unicode 3.1);
* QChar::Punctuation_Dask was just a typo.
Merge-request: 947
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
|
| |
Merge-request: 2482
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Corrected case on Symbian library.
|
| |
| |
| |
| | |
RevBy: Trust me
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
gdb_dwarf_index: change version constraint from 72 to 73
Revert "Remove gdb_dwarf_index from maemo mkspec"
Line ending fix.
Added mipmap property to QGLFramebufferObjectFormat.
Remove gdb_dwarf_index from maemo mkspec
|
| |/
| |
| |
| |
| |
| |
| | |
If the mipmap property is set, QGLFramebufferObject will
allocate memory for mipmap levels.
Reviewed-by: Gunnar
|
| |
| |
| |
| |
| | |
Task-Number: QTBUG-14435
Reviewed-by: Bradley T. Hughes
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The polling engine first retrieves a QFileInfo for a given path, then
tests whether it's different from before and if so, stores the new file
info and emits a signal. In case path is a directory the test also
checks if the list of directory entries has changed. This creates a
window between retrieving the file info and the test in which a file can
be added/removed from the directory or the directory itself can be
removed. In that case the test returns true, because the list of entries
has changed, but outdated file info is stored which means that on the
next timeout the same change will be reported a second time.
Therefore, refresh the file info after the test for changes.
Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A file descriptor is used for every path to be monitored, but descriptors
below FD_SETSIZE (typically 1024) are precious, for use with select(2). To
allow the application (and other parts of Qt) to use select(2), try to
duplicate the descriptor returned by open(2) above FD_SETSIZE and close(2)
the original. However, only do so when the descriptor table is already
fairly large (FD_SETSIZE / 2). This keeps the descriptor table small for
applications that use only a few descriptors.
While here, also set the close-on-exec flag on the (new) descriptor.
Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In the worker thread unlock the mutex between processing two events.
Otherwise it's possible for the worker thread to block the application
thread when many events occur. Also, there's no need to lock the mutex
when processing a pipe event. Generally the worker thread should hamper
the application thread as little as possible, so only lock the mutex
where needed.
Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Calls to write(2) potentially block, so make sure the application thread
unlocks the mutex before it writes to the pipe between itself and the
worker thread, so the latter can continue to process events and eventually
unblock the write call (if needed) by emptying the pipe.
Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The worker thread exits whenever the kevent call returns an error, but
in the case of EINTR (interrupted by signal) it should just call kevent
again. Otherwise for instance, attaching a debugger to the process
causes the worker thread to exit because of the SIGSTOP it receives.
Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
|/
|
|
|
|
|
|
|
| |
Using EV_ONESHOT and re-enabling the kevent after emitting the signal
allows for a window in which file system changes can go undetected. By
using EV_CLEAR instead the kevent can stay enabled.
Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix some memory leaks.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Update the retain/release mechanism for
CGContexts. Some leaks were due to unnecessary
retain calls.
Task-number: QTBUG-15373
Reviewed-by: Samuel Rødal
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix performance penalty in Win32MakefileGenerator::findHighestVersion
Allow QDial to wrap value when wrapping property is set.
QtScript variant conversion: Convert numbers to (u)int if applicable (reviewed by khansen)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QDial's wrapping property allows for 360 degree revolutions when using
the mouse. However whenever using the keyboard Up/Down/PageUp/PageDown
keys the QDial's value will stop at the minimum and maximum values.
This has been fixed to allow the bounds checker to account for the
wrapping property.
Merge-request: 2437
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
|
| |/
| |
| |
| | |
(reviewed by khansen)
|
|\ \ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix compliation of ALSA audio backend when checking for surround support.
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix compliation of ALSA audio backend when checking for surround support.
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Surround support requires ALSA lib >= 1.0.14
Task-number: QTBUG-15205
Reviewed-by: Andrew den Exter
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | /
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/corelib/global/qglobal.h
src/gui/kernel/qwidget_p.h
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qthread/tst_qthread.cpp
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
fix inf loop bug
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-15409
Reviewed-by: Andrew Den-Exter
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (28 commits)
Fixed tst_qwidget::winIdChangeEvent
Use parent class function to generate Makefile headers in Symbian
Fix spaces
Fix QPixmap::fromImage() in the OpenVG pixmap backend.
Native color dialog on symbian
Fix non-stroked filled paths in OpenVG paint engine.
Fix symbian-mmp.conf include path
Fix a build break when namespace is defined
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
...
|
| | |\ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (27 commits)
Use parent class function to generate Makefile headers in Symbian
Fix spaces
Fix QPixmap::fromImage() in the OpenVG pixmap backend.
Native color dialog on symbian
Fix non-stroked filled paths in OpenVG paint engine.
Fix symbian-mmp.conf include path
Fix a build break when namespace is defined
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
...
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If QPixmap::fromImage() was called with a QImage that has an alpha
channel and with the 'Qt::NoOpaqueDetection' image conversion flag set,
then we would always create an opaque (RGB32) pixmap. This is
incorrect.
The fix is to check if the source QImage has an alpha channel and if
so, use sourceFormat(), otherwise use RGB32.
Task-number: QT-4278
Reviewed-by: Jani Hautakangas
|
| | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Remove extra spaces
Reviewed-by: Miikka Heikkinen
|
| | | |\ \ \ |
|
| | | | |\ \ \ |
|
| | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
|
| | | | |_|/ / /
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Native color dialog implementation for Symbian.
During merge extra libraries removed.
Task-number: QT-3917
Reviewed-by: Sami Merila
Merge-Request: 932
Reviewed-by: Janne Koskinen
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The QPainter::fillRect() functions are optimizations to avoid state
changes in the paint engines. Since these functions should be
completely independant of state, ideally they should only call
functions that are also stateless.
QVGPaintEngine::fillRect() has two different code paths for this.
The vgClearRect() path of this function is stateless however in the
case of non-opaque or complex fills, this code path cannot be used and
instead we use the normal path fill function which is not entirely
stateless because ensureTransform() will apply the aliased coordinate
transform if the current state includes a stroked pen.
To avoid this happening for a pure fill (no stroke) we temporary set
the pen state to be Qt::NoPen such that the state used by
ensureTransform() is correct.
Task-number: QTBUG-14717
Reviewed-by: Jani Hautakangas
|
| | | |\ \ \ \ \
| | | | |/ / / /
| | | |/| / / /
| | | | |/ / /
| | | | | | |
| | | | | | | |
Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Jani Hautakangas
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
Fixed handling of QInputMethodEvents with nonzero replacementLength.
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
Documented usage of dialogs on Symbian
Native file dialog on Symbian^3
Add Location as self signable capability in patch_capabilities.pl
Localize .loc and .pkg content based on TRANSLATIONS
Bump Qt version to 4.7.2.
SSL: Fix for systemCaCertificates being called first on symbian
...
|
| | | | |\ \ \ \
| | | | | | |_|/
| | | | | |/| |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
These types of events replace text that is already in the widget, but
WebKit did not check for replacementLength at all.
RevBy: Janne Koskinen
Task: QT-4303
Task: https://bugs.webkit.org/show_bug.cgi?id=49787
AutoTest: Included
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-15393
Reviewed-by: axis
|
| | | | |\ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Missing symbian scope caused build break on non-symbian platforms.
Reviewed-by: Janne Koskinen
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Previously it was only possible to use EPOCROOT in qt.conf via env
variable, while qmake & configure could resolve it also via devices.xml.
Changed qt.conf parsing to support $${EPOCROOT} tag and use same
resolving logic as qmake & configure.
Task-number: QTBUG-15393
Reviewed-by: axis
|
| | | | |/ / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Corrected ASCII comparison and removed extra braces based on comments
Task-number: QT-3917
Reviewed-by: Janne Koskinen
Merge-request: 918
Reviewed-by: Janne Koskinen
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
RVCT4 has strict lookup rules. Calls from function
,that depends on a template parameter, to internal
static functions must be qualified.
Task-number: QTBUG-15424
Reviewed-by: Jason Barron
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
qcolordialog_symbian.cpp is removed from dialogs.pri and string
comparison corrected based on comments.
Task-number: QT-3917
Reviewed-by: Janne Koskinen
Merge-request: 918
Reviewed-by: Janne Koskinen
|