| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
bin/syncqt
src/corelib/io/qurl.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The reported bug was actually not a bug. It is ok to pass the enum
value as a string here, because the enumeration type has been
registered with the meta-object system with the Q_ENUMS()
macro. However, I have added a bit of text to clarify things a bit.
Task-number: QTBUG-7158
|
| |
| |
| |
| |
| |
| |
| | |
With the JSC-based back-end it's necessary to wrap the function
in parentheses.
Task-number: QTBUG-6644
|
| |\ |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Denis
|
| | |/
| |/|
| | |
| | | |
Task-number: QTBUG-5121
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/multimedia/audio/qaudioformat.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
examples/multimedia/audiodevices/audiodevices.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
-Added channelCount(), changed everything to use this instead
of channels() in QAudioFormat class.
-Added setSampleRate() and sampleRate(), changed everthing to use these
instead of setFrequency() and frequency() in QAudioFormat class.
-Added supportedSampleRates() and supportedChannelCounts(), changed
everything to use these instead of supportedFrequencies() and
supportedChannels() in QAudioDeviceInfo class.
Reviewed-by:Justin McPherson
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added setChannelCount() and updated docs/examples/tests to use it
instead of setChannels().
Reviewed-by:Justin McPherson
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-7158
|
| | |\ \ \
| | | | |/
| | | |/| |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Obsolete sis files were referenced.
Task-number: QTBUG-6601
Reviewed-by: Janne Koskinen
|
| | | |/
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-6348
Reviewed-by: Janne Koskinen
|
| | |/
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-6574
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/tools/moc/generator.cpp
|
| | |
|
|\ \
| |/
| |
| | |
kinetic-declarativeui
|
| |\
| | |
| | |
| | | |
4.6-staging2
|
| | |
| | |
| | |
| | | |
RevBy: Trust me
|
| | |\
| | | |
| | | |
| | | | |
4.6-staging2
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
By Janne Anttila:
- Switched links/references from 'S60' to 'Symbian'
- Added collection page for Symbian specific documentation
- Added page about application deployment for Symbian
- Update supported compiler list for Symbian to more specific one
- Added bullet about dev env. setup to Symbian installation page
- Commented that SBSv2 is not offically supported by current S60 SDKs
- Moved S60 3rd FP1 special patching note after SDK installation bullet
- Recommedation to look into Qt quick start guide from Symbian Forum
- Added Symbian bullet to known issues page and link to wiki
- Added link to "state of support" document from symbian docs main page
By aportale:
- Rephrasing
- More consistent naming of 'Qt for the Symbian platform'
- Implementation of suggestions from other Nokians
Reviewed-By: Janne Anttila
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
WebKit will not build unless the mentioned variable is set.
RevBy: Aleksandar Sasha Babic
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
By Janne Anttila:
- Switched links/references from 'S60' to 'Symbian'
- Added collection page for Symbian specific documentation
- Added page about application deployment for Symbian
- Update supported compiler list for Symbian to more specific one
- Added bullet about dev env. setup to Symbian installation page
- Commented that SBSv2 is not offically supported by current S60 SDKs
- Moved S60 3rd FP1 special patching note after SDK installation bullet
- Recommedation to look into Qt quick start guide from Symbian Forum
- Added Symbian bullet to known issues page and link to wiki
- Added link to "state of support" document from symbian docs main page
By aportale:
- Rephrasing
- More consistent naming of 'Qt for the Symbian platform'
- Implementation of suggestions from other Nokians
Reviewed-By: Janne Anttila
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
|
| |/
| |
| |
| |
| |
| | |
This code is used in the documentation for QRegion::isEmpty. It
shouldn't mention isNull, since isEmpty replaces it in the case of
QRegion (unlike QRect).
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Get rid of QGraphicsEffectSource from the public API, instead add
convenience functions in QGraphicsEffect. This way we commit to less
API, and are free to introduce a customizable QGraphicsEffectSource
in a future release.
* Move PixmapPadMode into QGraphicsEffect and tweak the names of the
enum values.
* Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility.
Reviewed-by: Bjørn Erik Nilsen
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/animation/qabstractanimation.cpp
src/gui/graphicsview/qgraphicsview.cpp
src/s60installs/s60installs.pro
tools/configure/configureapp.cpp
tools/qdoc3/node.h
|
| |
| |
| |
| |
| |
| |
| |
| | |
Correct typing error "azy" -> "az"
Ensure that the example code returns indicated values.
Task-number: QTBUG-5571
Reviewed-by: Peter Yard
|
| |
| |
| |
| | |
Reviewed-by: Sarah Smith
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
"Polished" was never a very descriptive word, and it already has a
meaning attached in the QStyle API. Additionally, "propertiesAssigned"
has the benefit of giving the relation to the assignProperty() function
as part of the name.
Reviewed-by: Kent Hansen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix some examples and wording, and add some clarification based on
comments in documentation review session.
Reviewed-by: Kent Hansen
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsitem_p.h
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/animation/qabstractanimation.cpp
src/s60installs/qt.iby
util/qlalr/cppgenerator.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| | |
This example is very old, doesn't work, and confuses anyone
who reads about it into thinking that OpenGL compositing is
possible with Qt/Embedded, which is not accurate.
Reviewed-by: trustme
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|