| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Task-number: QTBUG-9118
Reviewed-by: Dmytro Poplavskiy
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
I submitted the same updated configure.exe to both qt.git and qt-multimedia-staging.git.
Furthermore, there were other updates to configure.exe in qt.git. Seems git
cannot resolve this on it's own.
Conflicts:
configure.exe
|
| | | |
|
| | | |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits)
different approach to fixing "the other" aliasing issue
fix aliasing issue in node_construct()
detach in fewer cases, remove redundant calculation
SSL: Fix memleak related to local certificate
Improve keyboard layout detection on X11
Compile on ARM with -Werror -Wold-style-cast
Use the vista-style native dialog for QFileDialog::getExistingDirectory
Apply the stdset attribute for resource properties
doc: Completed sentence about HideNameFilterDetails
Doc fix in QLocale
Doc for for QGestureRecognizer::create.
Fix broken setCollectionFile (creating multiple models instead reusing)
Enable the fast paths when converting to Rgb565
qdoc: ifdefed out all the debug code.
Add missing QtScript API shims
Further fix license whitespace.
Remove NetworkManager test-bed application.
Remove configure test for NetworkManager.
Fix QDir::entryList regression
Add DEFINES to mingw32/windres.exe command line.
...
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits)
Fix broken setCollectionFile (creating multiple models instead reusing)
Enable the fast paths when converting to Rgb565
qdoc: ifdefed out all the debug code.
Add missing QtScript API shims
Further fix license whitespace.
Remove NetworkManager test-bed application.
Remove configure test for NetworkManager.
Fix QDir::entryList regression
Add DEFINES to mingw32/windres.exe command line.
Fix up whitespace in license headers.
Fix SetDialogPreference build error on Symbian.
get known wifi networks a more complicated way, but without accessing
Only enable BM by default in QNAM for appropriate platforms.
fix crash on 10.6 with no wifi interface
Fix creation of QNetworkSession.
Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe.
remove qt_winQString2MB() and qt_winMB2QString()
Fix include() path in qimportbase.pri
Fix qmake crash on Windows
Compile
...
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (56 commits)
Remove NetworkManager test-bed application.
Remove configure test for NetworkManager.
Fix QDir::entryList regression
Add DEFINES to mingw32/windres.exe command line.
Fix up whitespace in license headers.
Fix SetDialogPreference build error on Symbian.
get known wifi networks a more complicated way, but without accessing
Only enable BM by default in QNAM for appropriate platforms.
fix crash on 10.6 with no wifi interface
Fix creation of QNetworkSession.
Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe.
remove qt_winQString2MB() and qt_winMB2QString()
Fix include() path in qimportbase.pri
Fix qmake crash on Windows
Compile
Revert some unfinished changes.
Fix compilation with namespaced Qt
Add a placeholder text into the new search lineedit
Ui improvements to QDBusViewer.
Make double-clicking a d-bus method work again
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The NetworkManager plugin for Brearer Management no longer has a compile
time dependency on NetworkManager.
Task-number: QTBUG-9005
|
| | | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits)
get known wifi networks a more complicated way, but without accessing
Only enable BM by default in QNAM for appropriate platforms.
fix crash on 10.6 with no wifi interface
Fix creation of QNetworkSession.
Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe.
remove qt_winQString2MB() and qt_winMB2QString()
Fix include() path in qimportbase.pri
Fix qmake crash on Windows
Compile
Revert some unfinished changes.
Fix compilation with namespaced Qt
Add a placeholder text into the new search lineedit
Ui improvements to QDBusViewer.
Make double-clicking a d-bus method work again
Changed Qdbusviewer to match D-Bus type signature in addition to method name when finding a method.
qdoc: Added debug code.
Update separate regions instead of their bounding box.
doc: Fixed three new qdoc errors.
Autotest: make the qabstractslider test pass on mac
Compile
...
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
the keychain.
Users will still see the keychain prompt when attempting to
connect/associate with a wifi network.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-8954
|
| | | | | | | |
|
| |/ / / / /
| | | | |
| | | | |
| | | | | |
Reviewed-by: Justin McPherson
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (65 commits)
QSslKey: Do not make OpenSSL prompt for a password on stdin
Typo fix in qtestlib
Moved Symbian audio backend into QtMultimedia.dll
Updated Symbian DEF files
Updated qt.iby
Fixed filename cases to support building Qt for Symbian in Linux
Moved softkey "Options" action handling from QMainWindow to QMenuBar.
HotFix for fluidlauncher default size caused by 6d44dadd.
Removed compiler warning from qdesktopwidget_s60.cpp.
Ensure that the entire CLOB can be returned from an Oracle database
QAudioInput sometimes not writing to QIODevice
isalpha() is unspecified for values outside uchar and EOF
Fixed bug in QTransform::type() after using operator/ or operator*.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 )
Doc: Removed lie that access to QBuffer is unbuffered.
Minisplitter doesn't paint to the bottom/right
Support for adding user specified list type content in rss file
Fixed RSS_RULES statement in application_icon.prf
Avoid unnecessary memory allocation in the jpeg handler's image detection
QVarLenghtArray: Call constructor when resizing the array for Movable types.
...
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Changed backend from being a plugin, to being statically compiled into
QtMultimedia.dll. This is to achieve consistency with the backends for
other plugins, and to allow the plugin API to be modified.
Task-number: QTBUG-8994
Reviewed-by: trustme
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Part of QtP delta reduction effort.
Task-number: QT-3055
Reviewed-by: Janne Koskinen
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 )
Doc: Removed lie that access to QBuffer is unbuffered.
Minisplitter doesn't paint to the bottom/right
Avoid unnecessary memory allocation in the jpeg handler's image detection
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The handler calls peek with 2 bytes to inspect the first two bytes. Instead
of calling the overload of peek() that returns a new QByteArray with just
two bytes, allocate 2 bytes on the stack and call the overload of peek()
that writes into the specified buffer.
Reviewed-by: Joao
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed dialog resize not to move the dialog for Symbian.
Fix SDP files are not supported.
Fix build break caused by undefined symbol SetDialogPreference
Renamed test benchmark targets.
Added check for null pointer in qt_vg_unregister_pixmap.
Add '.' dir as the first include directory in Symbian
Enabled some examples by default in Symbian builds
Added forwarding headers for qplatformdefs.h in Symbian mkspecs
QUnixPrintWidget should not be declared in Symbian
Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location.
Export qtdemoapps.iby to proper location
Added some missing IBY export paths to platform_path.prf
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed dialog resize not to move the dialog for Symbian.
Fix SDP files are not supported.
Fix build break caused by undefined symbol SetDialogPreference
Renamed test benchmark targets.
Added check for null pointer in qt_vg_unregister_pixmap.
Add '.' dir as the first include directory in Symbian
Enabled some examples by default in Symbian builds
Added forwarding headers for qplatformdefs.h in Symbian mkspecs
QUnixPrintWidget should not be declared in Symbian
Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location.
Export qtdemoapps.iby to proper location
Added some missing IBY export paths to platform_path.prf
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
sqlite3.iby needs to be exported under epoc32/rom/include/core/mw,
instead of epoc32/rom/include.
Part of QtP delta reduction effort
Reviewed-by: TrustMe
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: Related to QTBUG-5117
Reviewed-by: Jørgen Lind
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Don't use localtime_s.
Reviewed-by: thartman
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QList<T>::remove() is QT3_SUPPORT, replace with erase().
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Since DirectFB always uses the front buffer of a double buffered surface
as the source when blitting we needed to make sure that the front buffer
was valid and hence we called Flip for each scroll. This had negative
performance impacts since you could end up with various parts of a
window being updated at different times.
With this patch we store whether the front-buffer is up to date inside
the window surface and only call Flip in scroll if it's not.
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
DirectFB will print a warning for this since the file doesn't exist but
we might as well not try when we know the file doesn't exist.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| |/ / / /
| | | |
| | | |
| | | | |
Reviewed-by: Andrew den Exter
|
| | |/ /
|/| |
| | |
| | |
| | | |
Task-number: QTBUG-9001
Reviewed-by: Kurt Korbatits
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned.
Delayed initialization of gstreamer video widget.
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This saves time/memory when the video widget control is not used,
and allows using of audio only QMediaPlayer in non gui applications.
Reviewed-by: Justin McPherson
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Olivier Goffart
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Half of the instructions were jumps to the constructor or
QChar. We can assume the char are on 16 bits and do the
assignation directly.
Reviewed-by: Andreas Kling
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The previous implementation was using QString::operator+=() for
every converted character. This was resulting in thousands of
malloc, making those conversions slow.
Reviewed-by: Andreas Kling
|
| | |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits)
fix corewlan detection error when building for 10.5 when 10.6 is also
fixed treatment of zlib on Mac when crossbuilding
Partial overloading support for qdbus cli tool.
Allow empty authority in QUrl::setAuthority as per docs.
Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority.
fixed case of GL include directory
check in MAC_APPLICATION_MENU translations
Re-generate the Unicode tables after updates to the program that generates them
Fix the code after merge: DerivedNormalizationProps has two or more columns
add some usefull definitions to qunicodetables_p.h
qchar.cpp: fix identation
finish last commit
prefer DerivedNormalizationProps.txt over CompositionExclusions.txt
improve error reporting a bit more
improve error reporting
fix incorect condition
check if string to int conversions were done w/o errors
improve error reporting for unassigned grapheme/word/sentence break classes
avoid using of qunicodetables_p.h in generator
use QHash for line break map
...
|
| | |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
DSPF_DST was added in 1.2.9, not in 1.2.0
Reviewed-by: muthu <qt-info@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If you call fillRect(QBrush(QColor())); we should short-circuit before
falling back to the raster engine.
Reviewed-by: muthu <qt-info@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If you specify an operation that is not recognized in
QT_DIRECTFB_WARN_ON_RASTERFALLBACKS or
QT_DIRECTFB_DISABLE_RASTERFALLBACKS
Reviewed-by: muthu <qt-info@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QT-1849
Reviewed-by: Jeremy
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Allow people to control whether or not to warn on/disable raster
fallbacks using the following mechanism:
export QT_DIRECTFB_DISABLE_RASTERFALLBACKS="draw_pixmap|draw_text"
export QT_DIRECTFB_WARN_ON_RASTERFALLBACKS="draw_lines"
It's still possible to define QT_DIRECTFB_WARN_ON_RASTERFALLBACKS to
something for legacy reasons.
The environment variable check is only available in debug mode.
|
| | | | | | |
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
It seems that I have to premultiply the colors I pass to
IDirectFBSurface->SetColor when composition mode != Source|SourceIn.
It now seems to behave the same way as the raster engine which I guess
should be considered the authority on this matter.
Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Qt heuristics say that a QPixmap becomes an alpha pixmap when filled
with a color with alpha != 255 but not that it returns to being opaque
when filled with a color with alpha == 255
Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This porter duff rule was added in DirectFB 1.2
Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
|
