summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-061-1/+2
|\ | | | | | | kinetic-declarativeui
| * Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-062-1/+4
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| | * Added comment to QTextStream - clarification of the documentationMorten Engvoldsen2009-05-061-1/+2
| | | | | | | | | | | | | | | | | | Explained why you cannot use QTextStream::atEnd with stdin. Task-number:251171
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-061-0/+2
|\ \ \ | | |/ | |/| | | | kinetic-declarativeui
| * | Fix memory leak in QFutureMorten Sørvig2009-05-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-0512-119/+137
|\ \ \ | | |/ | |/| | | | kinetic-declarativeui
| * | Use the new QTextCodec::codecForUtfText in qtextstream to detect theDenis Dzyubenko2009-05-041-7/+2
| | | | | | | | | | | | | | | | | | utf encoding by BOM. Reviewed-by: Simon Hausmann
| * | When data was copied from Mozilla Firefox to Qt, the text format was not valid.Denis Dzyubenko2009-05-042-12/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Deprecate qt_mac_set_show_menubar for a public cross-platform API.Norwegian Rock Cat2009-05-042-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtOlivier Goffart2009-05-042-7/+3
| |\ \
| | * | prefer macro over stubMaurice Kalinowski2009-05-042-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | Merge commit 'origin/4.5'Olivier Goffart2009-05-042-90/+25
| |\ \ \ | | |/ / | |/| / | | |/ | | | Conflicts: src/gui/itemviews/qabstractitemview.cpp
| | * Greatly reduced the complexity of the boilerplate function.Thiago Macieira2009-05-041-90/+17
| | | | | | | | | | | | | | | | | | | | | | | | 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 comment to clearify the use of indexes.Morten Engvoldsen2009-05-041-0/+8
| | | | | | | | | | | | | | | | | | | | | Added a comment about the use of negative indexes. Task-number: 249344 Rev-by: Marius Storm-Olsen
| * | Fixed QFile::copy/rename fail after initial failed attemptJoão Abecasis2009-04-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Add qDrawBorderPixmap() function, Qt::TileRules enum, QMargins struct and ↵Marius Bugge Monsen2009-04-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | introduce Q_WS_WINCEMaurice Kalinowski2009-04-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-2/+9
| |\ \ | | |/
| | * performance improvement of isUncRoot in qfsfileengine_win.cppJoerg Bornemann2009-04-281-2/+9
| | | | | | | | | | | | | | | | | | | | | We always called QStringList::split in this function, which was just expensive. Reviewed-by: mauricek
* | | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-048-8/+8
| | |
* | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-301-1/+1
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-281-2/+3
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | Compile Warnings removed in canConvertThierry Bastian2009-04-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-281-1/+1
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-281-1/+1
| | | |
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-2812-57/+70
|\ \ \ \ | | |/ / | |/| | | | | | kinetic-declarativeui
| * | | Fixed to float support in QVariantThierry Bastian2009-04-271-25/+33
| | | | | | | | | | | | | | | | also added autotests
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-242-5/+2
| |\ \ \ | | | |/ | | |/|
| | * | Return the correct MIB number for TSCII. When the code wasFrans Englich2009-04-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Alias for QUtf16Codec is wrong.Frans Englich2009-04-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested/spotted by Nokia i18n team/Darpan. Task-number: 252102 Reviewed-by: Denis AutoTest: In this submit.
| | * | Change Qt version number to 4.5.2Thiago Macieira2009-04-241-2/+2
| | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | Remove the Direct3D engine.Gunnar Sletta2009-04-241-8/+7
| | | |
| * | | Merge branch '4.5'Thiago Macieira2009-04-232-2/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | * | Fixes for QByteArrayMatcherJoão Abecasis2009-04-232-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-234-6/+8
| |\ \ \ | | |/ /
| | * | Allow QThread to start a QTimer and QEventLoop before QCoreApplication is ↵Bradley T. Hughes2009-04-234-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-232-11/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
| | * | Doc fixesJoão Abecasis2009-04-221-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Thiago
| | * | Make make_qfeatures_dot_h script generate the current copyright header.Jason McDonald2009-04-221-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the script, and update the generated file. Reviewed-by: Thiago Reviewed-by: Paul Olav Tvete
* | | | Revert "Fix sefaults introduced by merge."Michael Brasser2009-04-283-76/+83
| |_|/ |/| | | | | | | | This reverts commit 0e8b82bc7b9b0d88e8cc4a4d293851795d35950a.
* | | Add a declarative data ptr to QObjectPrivateAaron Kennedy2009-04-272-1/+19
| | | | | | | | | | | | 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.
* | | Simplify QMetaProperty::propertyIndex functionAaron Kennedy2009-04-271-1/+1
| | | | | | | | | | | | RevBy: Kent Hansen
* | | Fix sefaults introduced by merge.Michael Brasser2009-04-233-83/+76
| | | | | | | | | | | | | | | For now, use kinetic-animations' version of the qvariant changes, as the ones in master cause segfaults.
* | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-04-222-20/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/gui/animation/qguivariantanimation.cpp
| * | | Fixes QPropertyAnimation's default start value update conditionLeonardo Sobral Cunha2009-04-222-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The default start value is updated when the animation changes from Stopped to Running state. Reviewed-by: Jan-Arve
* | | | Fix merge error.Michael Brasser2009-04-221-4/+30
| | | |
* | | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeuiMichael Brasser2009-04-2258-1787/+2190
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | Expose QVariantAnimationPrivate::getInterpolator in the private headerLeonardo Sobral Cunha2009-04-212-2/+4
| | | | | | | | | | | | | | | | These interpolator functions might be useful for other internal classes.
| * | | QPropertyAnimation reevaluates the default start value after each runLeonardo Sobral Cunha2009-04-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-211-1/+2
| |\ \ \