| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits)
doc: Fixed some qdoc errors.
Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text.
Allow building documentation without all of Qt
Added a documentation for the new enum value in gesture api.
Remove the OBJECTS_DIR variable assignment from some projets in Qt.
Fix compile
qmake/MinGw: Link statically for Qt Creator to be able to detect it.
Enable two fast path for blend_tiled_rgb565
Avoid QString reallocation for smallcaps fonts in Itemizer::generate()
Make QLabel::text a reloadable property
remove non wifi interfaces from being handled.
Disable auto-uppercasing and predictive text for password line edits.
Avoid QString reallocation in QTextEngine::itemize()
Remove the Qt 4.7 #if guards that were needed for 4.6
Always redraw the complete control when an input event comes in.
Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5)
Fix compilation: include QString in order to use QString.
Fix compile
Block the Maemo5 window attribute values from being assigned to something else on other platforms.
be more verbose when warning about incompatible libraries
...
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Olivier Goffart
|
|/
|
|
|
|
| |
using pkg-config from pri file is not good for cross-compiling
Reviewed-by: paul
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/declarative/graphicsitems/qdeclarativeevents.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/qml/qdeclarativescript.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativeeasefollow.cpp
src/declarative/util/qdeclarativefontloader.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativespringfollow.cpp
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativesystempalette.cpp
src/declarative/util/qdeclarativetimer.cpp
src/declarative/util/qmlstateoperations.cpp
src/multimedia/qml/qdeclarativeaudio.cpp
src/multimedia/qml/qdeclarativevideo.cpp
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeparticles.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/multimedia/qml/qml.pri
src/multimedia/qml/qmlaudio_p.h
src/multimedia/qml/qmlgraphicsvideo_p.h
src/multimedia/qml/qmlmediabase_p.h
src/plugins/qmlmodules/multimedia/multimedia.cpp
|
| | | | |
|
|/ / /
| | |
| | |
| | | |
Reviewed-by: Thiago Macieira
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | | |
Conflicts:
configure
src/plugins/mediaservices/mediaservices.pro
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Add -mediaservice argument to configure.
Remove active qDebugs.
Player demo updated with more user-friendly previous button behaviour.
Added QNetworkRequest constructor to QMediaContent.
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Add private header warning.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Enables building the default media service backend for a platform.
Is on by default if the build environment requirements are met and
-no-mediaservice disables the option.
Reviewed-by: Justin McPherson
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
configure
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
configure
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/s60installs/s60installs.pro
|
| | | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure
src/gui/painting/qpainter.cpp
src/s60installs/s60installs.pro
|
| | | | |
| | | | |
| | | | |
| | | | | |
Untested, I don't have a mac.
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-By: Thiago
|
| |_|_|/
|/| | |
| | | |
| | | | |
Reviewed-By: TrustMe
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| | |/
| |/| |
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-7683
Reviewed-by: Tom Cooksey
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-7549
Reviewed-By: Markus Goetz
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |
| | |
| | |
| | |
| | |
| | | |
Escape the arguments variable properly.
Reviewed-by: Thiago
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
e.g. QMAKE_INCDIR_OPENGL_ES2
Merge-request: 2279
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
AUTODETECT_COCOA -> QT_AUTODETECT_COCOA
Reviewed-by:thiago
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
$CFG_MAC_COCOA has a default value of yes now so be sure we the platform
is Mac before doing anything with it.
Reviewed-by:thiago
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Only perform the architecture check when "-carbon" has
been specified on the configure line, as this is the
only case where cocoa might have to be enabled on an
arch by arch basis.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The "-cococa" option is now deprecated, "-carbon" is added.
This is mostly a behind-the-scenes change, but has some implications:
If you are developing on Snow Leopard Qt vill be built in x86_64
mode by default. This can be overridden by configuring with "-arch x86"
Qt for Cocoa will not build on 10.4 Tiger, nor will Cocoa-based
binaries deploy back to that platform. Configure with "-carbon"
if you want to target 10.4.
|
| | |
| | |
| | |
| | | |
Designer.
|
|/ /
| |
| |
| |
| |
| | |
Task:QTBUG-2158
Designer no longer uses XShape for Drag and Drop.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Adds new NEON configure test and -no-neon configure option. NEON
implementations can also be turned off by setting the QT_NO_NEON
environment variable.
Performance improvements (in frames per second):
- Blending ARGB32 on RGB32/ARGB32, mostly opaque: 71 %
- Blending ARGB32 on RGB32/ARGB32, no opaque pixels: 108 %
- Blending ARGB32 on RGB32/ARGB32, with 0.5 opacity: 158 %
- Blending RGB32 on RGB32/ARGB32, with 0.5 opacity: 189 %
Task-number: QTBUG-6684
Reviewed-by: Gunnar Sletta
Reviewed-by: Paul Olav Tvete
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fix compilation with -static on Mac OS X
Configure support for multiple include levels in qmake.conf hierarchy.
Stop the configuration if the test compiler cannot be found.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If a configuration file included in qmake.conf had an include
statements of its own, the variables defined in the second level
of included files were not parsed by getQMakeConf function from
configure.
Author: Adrian Constantin <adrian.constantin@nokia.com>
Reviewed-by: Thiago Macieira
|
| | |
| | |
| | |
| | |
| | | |
Author: Adrian Constantin <adrian.constantin@nokia.com>
Reviewed-by: Thiago Macieira
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Fix precision loss warning (qreal vs. float on Windows)
def file maintenance.
def file maintenance.
Fixed compile for S60 (.def file updates).
QPlainTextEdit scrolling issue with folded paragraphs
Designer: Show actions in action editor in QKeySequence::NativeText
Fix up documentation examples for low-level audio.
Add -audio-backend and -no-audio-backend configure option.
audioinput and audiooutput examples not using isFormatSupported
Qt fails to build on RHEL 4 and other older Linux versions because of
|
| |\ \ |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure.exe
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Allow better control over audio backend used.
Reviewed-by:Justin McPherson
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add an image allocation pool to the OpenVG paint engine
Fix QMetaObject::connect and disconnect with "dynamic signals"
Test fixed for Windows CE.
Removed the chip demo for windows CE
Compilation fix for Windows Mobile
Make mkspec/unsupported/linux-host-g++ use correct include
Add "nocopy" mode for seperate-debug-info to configure
Optimized blur / drop shadow effects for the GL 2 paint engine.
Fixed bug in graphics effects caching of graphics item hierarchies.
Added InvalidateReason to invalidateCache to optimize effects
Fixed bug in QGraphicsPixmapItem shortcut for graphics effects.
Optimize QGraphicsItemEffectSourcePrivate::pixmap() for QGraphicsPixmapItems.
Improved raster blur implementation.
Determine QPrinterInfo's supportedPaperSizes on demand.
Added vg to the performance section of the QPainter docs
Stabilize test
Fix warning in public header
OpenVG .def file updates.
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This patch was written by Harald Fernengel for Maemo5 port. This effectively
just adds -g to QMAKE_CFLAGS & QMAKE_CXXFLAGS and is mainly for packagers who
want to build Qt in release mode and still have debug symbols, but will want
to strip those debug symbols out themselves (rather than let Qt do it).
Reviewed-By: Harald Fernengel
Reviewed-By: Thiago Macieira
|