| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
kinetic-declarativeui
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| | |
| | |
| | |
| | |
| | |
| | | |
Explained why you cannot use QTextStream::atEnd with stdin.
Task-number:251171
|
|\ \ \
| | |/
| |/|
| | | |
kinetic-declarativeui
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The held results were not cleared by QFutureInterface::operator=(QFutureInterface)
Add call to resultStore().clear(), similar to the destructor.
This needs to be done in the header since we know the template type here.
Task-number: 252208
Reviewed-by: brad
|
|\ \ \
| | |/
| |/|
| | | |
kinetic-declarativeui
|
| | |
| | |
| | |
| | |
| | |
| | | |
utf encoding by BOM.
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Mozilla encodes the text/html format in UTF16 and adds a BOM, however
it doesn't specify the charset in the html header. The fix is to guess
the encoding by either charset in the html header or BOM for text/html
format, or by BOM for non html formats.
This commit adds a new public function QTextCodec::codecForUtfText() which
can be used to guess encoding out of the BOM.
Task-number: 250555
Reviewed-by: Benjamin Poulain
Reviewed-by: Simon Hausmann
Reviewed-by: Andreas Aardal Hanssen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
I'm tired of these "hidden" functions. We have an
AA_MacPluginApplication, but sometimes you may have a legitimate reason
for setting this outside of "plugin applications." In the footsteps of
the menu icon attribute, the attribute is the main leader, but menubars
can disable/enable this locally the new QMenuBar::setNativeMenuBar()
property. Otherwise, the menubars take their que from the application
attribute.
This also works for Windows CE. So, there is a bit on convergence as
well.
Task-number: 236757
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- Windows Mobile does the same, thus we will not have double definitions or such
- COINIT_MULTITHREADED is the default, meaning that 0 usually expands to it. Just be on the safe side and be more precise.
Task-number: 237029
Reviewed-by: joerg
|
| |\ \ \
| | |/ /
| |/| /
| | |/
| | | |
Conflicts:
src/gui/itemviews/qabstractitemview.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
I found out that all I needed to load the proper libraries was
to add a string to the ".interp" section of the ELF executable
containing the path to ld.so
Reviewed-By: Marius Storm-Olsen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added a comment about the use of negative indexes.
Task-number: 249344
Rev-by: Marius Storm-Olsen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These functions were checking the error state after calling close(),
without first resetting the error state. Turns out close() only resets
the error state if isOpen() returns false.
Also, the fallback for the copy operation opens the file for reading
but wasn't closing it again afterwards. Now fixed.
Added autotests to cover these situations.
Reviewed-by: MariusSO
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QTileRules struct.
Implements a function to allow drawing CSS3-like border-images (also known as nine-grid images). Next step will be to convert the CSS-style code to use this function for drawing border-images.
Task-number: none
Reviewed-by: jbache
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: 246130
Reviewed-by: joerg
Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we
decided to stick with Q_WS_WIN32, but having a separate define
makes the code more readable. In addition Q_WS_WINCE_WM is available
for Windows Mobile only parts, where we do not check for the OS on
runtime.
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We always called QStringList::split in this function, which was
just expensive.
Reviewed-by: mauricek
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
| | |
| | | |
kinetic-declarativeui
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These were caused by a comparison between QVariant::Type and
QMetaType::Type. We're using QMetaType::Float because QVariant have no
such Float value
Reviewed-by: denis
|
|\ \ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | |
|
|\ \ \ \
| | |/ /
| |/| |
| | | | |
kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | | |
also added autotests
|
| |\ \ \
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
written, IANA hadn't assigned one.
Requested/spotted by Nokia i18n team.
Task-number: 251790
Reviewed-by: Brad
Reviewed-by: Denis
AutoTest: In this submit.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Requested/spotted by Nokia i18n team/Darpan.
Task-number: 252102
Reviewed-by: Denis
AutoTest: In this submit.
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-By: TrustMe
|
| | | | |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/qaction/tst_qaction.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Copy constructor and assignment operator lose data: pointer to content
and the length of content also need to be copied over.
QByteArrayMatcher::pattern() would return a null byte array if instance
was initialized with c-string.
Changed default constructor to explicitly initialize pattern length to
zero.
The bug in the assignment operator is a regression against 4.4.3.
Task-number: 251958
Reviewed-by: MariusSO
Reviewed-by: paul
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
constructed
Fix a regression from 4.3 to 4.4 that prevented QThread from starting
timers and event loops before QCoreApplication was instantiated. Even
though this is documented not to work, it seems that people have been
relying on it.
This reverts commit e52e5acdfa198cd079bbfe3a9302debf46c7cadd which
attempted to work around not calling g_thread_init() multiple
times. The proper fix is to serialize the g_thread_supported() checks
in the Glib event dispatcher.
Task-number: 248191
Reviewed-by: denis
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/global/qfeatures.h
src/gui/painting/qtransform.cpp
util/scripts/make_qfeatures_dot_h
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Update the script, and update the generated file.
Reviewed-by: Thiago
Reviewed-by: Paul Olav Tvete
|
| |_|/
|/| |
| | |
| | | |
This reverts commit 0e8b82bc7b9b0d88e8cc4a4d293851795d35950a.
|
| | |
| | |
| | |
| | | |
This data ptr does not increase the size of the QObject, as we take advantage of space only used during destruction. Currently this data is only used to store an object's QmlContext, but it will be used for more later.
|
| | |
| | |
| | |
| | | |
RevBy: Kent Hansen
|
| | |
| | |
| | |
| | |
| | | |
For now, use kinetic-animations' version of the qvariant changes, as the
ones in master cause segfaults.
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into kinetic-declarativeui
Conflicts:
src/gui/animation/qguivariantanimation.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The default start value is updated when the animation changes from
Stopped to Running state.
Reviewed-by: Jan-Arve
|
| | | | |
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
|
| | | |
| | | |
| | | |
| | | | |
These interpolator functions might be useful for other internal classes.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the start value is not explicitly defined, the property animation
will set the default start to be the current property value when updating
the animation's state to Running.
Reviewed-by: Jan-Arve
|
| |\ \ \ |
|