| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Replaces the existing NVIDIA EGL extension
"EGL_NV_post_convert_replication" with another newer extension named
"EGL_NV_post_convert_roundinng". The newer extension produces similar
result when posting 16 bit surfaces to 24/32 bit as the old and
performs faster. Motivated by qtbug-9444.
Merge-request: 742
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Translate bughowto.qdoc into zh_CN.
diagramscene example: fix leak and crashes.
qdoc: Reorganized the QML elements table to be a dictionary...
qgrayraster: Speed up rendering of small cubic splines.
Fix compilation: QT_NO_LINEEDIT
Doc: Removed invalid entities in documentation.
Doc: Fixes to Qt Quick documentation.
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/elements.qdoc
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Based on these upstream freetype2 commits:
7fb3ef64a24489189113f693696eaf935f500c3f
e419f48b40a746465a6c8e1d446b407b8677bfed
Reviewed-by: Samuel Rødal
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 774
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |/
| | |
| | |
| | | |
...and a set of functional group pages.
|
| |\ \ |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/getting-started/demos.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
To-be-verified-by: Qt Doc Team
|
|\ \ \ \ \ \ \
| |_|_|_|_|_|/
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QProcessManager destruction
Fix "installer_sis" and "deploy" targets when TARGET has path
Fix for memory leak in qt_init
Fix check to remove unnecessary deployments in Symbian
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix "installer_sis" and "deploy" targets when TARGET has path
Fix for memory leak in qt_init
Fix check to remove unnecessary deployments in Symbian
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Miikka Heikkinen
|
|\ \ \ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | /
| | | |_|_|_|_|/
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: removed assistant style and reintroduced the index page icons.
Cocoa: Stacking order of modal dialogs is wrong
qdoc: Added the fix to change qml-qml-file.name to qml-file.name
Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)
Make this constructor explicit in Qt too.
Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
|
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | | |
|
| | |/ / / /
| | | | | |
| | | | | |
| | | | | | |
Wrap new APIs in ifndef QT_MOBILITY_BEARER.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Minor update. Fixes infinite loops.
|
| | | | | | |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/plugins/bearer/icd/qicdengine.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/plugins/bearer/icd/qicdengine.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
even when there was an active connection.
Fixes: NB#181984 - QNetworkConfigurationManager reports offline even when connected.
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@nokia.com>
Signed-off-by: Jukka Rissanen <jukka.rissanen@nokia.com>
|
| | | | | | |
|
|/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
in QNetworkConfigurationManager. The session state is only changed
according to status messages sent by icd.
Fixes: NB#182148 - QNetworkSession changes to disconnected state immediately after opening session
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Clear previous animation data for non-triggering animations.
Fix configure -help output. declarative module is built by default.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We need to clear the data from the last run if the animation doesn't
match any of the state actions (or if there are no actions).
Task-number: QTBUG-12805
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Clean up rasterfallback mechanism in DirectFB
QNAM HTTP: Fix crash related to aborted uploads
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Being able to debug which paint operations are slow with Qt/DirectFB is
currently only possible in debug builds (which defeats the purpose
somewhat) or by frequent recompilation (with different defines).
This patch cleans up the mechanism somewhat and makes it available in
release builds as well.
The overhead is a single int comparison so it really isn't a performance
issue to have this code in place at all times.
Reviewed-by: Anders Bakken <agbakken@gmail.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-12285
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QAudioOutput(ALSA); Fix check for available devices.
Phonon; Update CMakeLists.txt
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QAudioOutput(ALSA); Fix check for available devices.
Phonon; Update CMakeLists.txt
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
ALSA can return a list of one empty item when no devices are available.
Task-number: QTBUG-12690
Reviewed-by: Andrew den Exter
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into 4.7
|
| | | | | | | | | |
|
|\ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Properly emit geometryChanged() when the position change.
QCoreApplication::library path, ensure mutex lock ordering
Fix memory leak.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Do not keep the libraryPathMutex locked while calling QFactoryLoader::refreshAll
QFactoryLoader also lock a mutex, and recurse into QCoreApplication::libraryPath
Reviewed-by: Brad
Helgrind warning for reference:
==8442== Thread #1: lock order "0xDEBA470 before 0xDF63600" violated
==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102)
==8442== by 0x8025A8E: QCoreApplication::libraryPaths() (qcoreapplication.cpp:2234)
==8442== by 0x8006FDC: QFactoryLoader::update() (qfactoryloader.cpp:109)
==8442== by 0x8006F32: QFactoryLoader::QFactoryLoader(char const*, QString const&, Qt::CaseSensitivity) (qfactoryloader.cpp:99)
==8442== by 0x6DE4351: qt_guiPlatformPlugin() (qguiplatformplugin.cpp:101)
==8442== by 0x6DE7A5B: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:934)
==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111)
==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323)
==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793)
==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712)
==8442== by 0x41350F: main (tst_examples.cpp:227)
==8442== Required order was established by acquisition of lock at 0xDEBA470
==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102)
==8442== by 0x8025FC3: QCoreApplication::addLibraryPath(QString const&) (qcoreapplication.cpp:2335)
==8442== by 0x6DE792D: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:927)
==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111)
==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323)
==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793)
==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712)
==8442== by 0x41350F: main (tst_examples.cpp:227)
==8442== followed by a later acquisition of lock at 0xDF63600
==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102)
==8442== by 0x80086A9: QFactoryLoader::refreshAll() (qfactoryloader.cpp:249)
==8442== by 0x802607E: QCoreApplication::addLibraryPath(QString const&) (qcoreapplication.cpp:2344)
==8442== by 0x6DE792D: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:927)
==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111)
==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323)
==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793)
==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712)
==8442== by 0x41350F: main (tst_examples.cpp:227)a
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix memory leak.
|
| | | |_|/ / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Mac only bug - run examples/opengl/overpainting under leak detect
instrument on Mac OSX to see it.
Memory leak in any application that called getProcAddress() - CFStrings
have to be cleaned up if the name of the function you got them from
contains the word "Create" - and we weren't doing that.
Reviewed-by: Gunnar Sletta
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Merge-request: 2448
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change fb00d5003ac5d91953a95d8164180f8f56a2b0f2 introduced a slight
behavioural change by leaving the surface handle dangling. We need
to unset the surface handle even if we don't own it to make sure we
don't access it again.
Reviewed-by: Gunnar Sletta
|
|/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This lets us destroy the share widget temporarily if we want to free up
OpenGL resources for a while.
Reviewed-by: Gunnar Sletta
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
update Russian translations for Qt and tools
Updated Slovenian translations for Qt 4.7
doc: The QML Qt element was missing from the documentation.
64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256
QXmlStreamReader: avoid unnecessary detaching
QSslCertificate: support expiration dates > 2049
Doc: Fixing typo
Doc: Fixing bug involving header misplacement in Creator style
qdoc: Added list of all members (including inherited) page to QML elements.
qdoc: Ensured that text is encoded correctly.
qdoc: Fixed non-well-formed markup.
Doc: Fixed typo in a shortcut string.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Doc: Added more license information.
|