summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation with WINSCW: no varargs macrosThiago Macieira2009-08-221-9/+9
| | | | src\3rdparty\webkit\JavaScriptCore\wtf\Assertions.h:150: badly punctuated parameter list in `#define'
* Export QClipData and QRasterBufferAnders Bakken2009-08-211-2/+2
| | | | | | These classes are needed in QDirectFBPaintEngine. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Clean up surface creation code in dfbAnders Bakken2009-08-215-145/+66
| | | | | | | Don't try too hard to temporarily represent an image in a real directfb surface. It leads to all sorts of rendering issues. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Merge branch 'master' of git@scm.dev.troll.no:qt/qtAlessandro Portale2009-08-212-1/+2
|\
| * Export QRasterizerAnders Bakken2009-08-211-1/+1
| | | | | | | | | | | | This is required for QDirectFBPaintEngine to link. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * CompileAnders Bakken2009-08-211-0/+1
| | | | | | | | | | | | Apparently QScopedPointer requires knowledge of the class it points to. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Warning fix: mask_format = unreferenced parameterAlessandro Portale2009-08-211-0/+1
| |
* | "d->" is not used. Fix MSVC warning.Alessandro Portale2009-08-211-2/+0
| |
* | Fixed unreferenced variable warning in Release mode.Alessandro Portale2009-08-211-2/+1
| |
* | Fixed an MSVC 9.0 /2008 warningAlessandro Portale2009-08-211-5/+5
|/ | | | Reviewed-By: Harald Fernengel
* Add missing license headers and header guards.Jason McDonald2009-08-214-5/+158
| | | | Reviewed-by: Trust Me
* Fix obsolete license headers.Jason McDonald2009-08-218-18/+18
| | | | Reviewed-by: Trust Me
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJason McDonald2009-08-214-17/+23
|\
| * Remove the unnecessary double memcpy now too.Thiago Macieira2009-08-211-3/+0
| | | | | | | | | | | | | | The previous commit reintroduced memcpy in detach2(). So we don't need to do memcpy here. Re-add the memcpy when detach3() is introduced.
| * Don't access usedHashFunc() if it's already been deleted.Thiago Macieira2009-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem spotted in Designer: ==13197== Invalid read of size 4 ==13197== at 0x5C9AD2A: QHash<QString, QConfFile*>::isEmpty() const (qhash.h:283) ==13197== by 0x5C98142: QHash<QString, QConfFile*>::remove(QString const&) (qhash.h:769) ==13197== by 0x5C8C9FF: QConfFile::~QConfFile() (qsettings.cpp:226) ==13197== by 0x5C9238E: QConfFileSettingsPrivate::~QConfFileSettingsPrivate() (qsettings.cpp:1228) ==13197== by 0x5C9D7AA: QScopedPointerDeleter<QObjectData>::cleanup(QObjectData*) (qscopedpointer.h:62) ==13197== by 0x5CF11A4: QScopedPointer<QObjectData, QScopedPointerDeleter<QObjectData> >::~QScopedPointer() (qscopedpointer.h:100) ==13197== by 0x5CE9B46: QObject::~QObject() (qobject.cpp:992) ==13197== by 0x5C95C90: QSettings::~QSettings() (qsettings.cpp:2754) ==13197== by 0x5CC1FDC: LibraryData::~LibraryData() (qlibrary.cpp:428) ==13197== by 0x5CC2441: QGlobalStaticDeleter<LibraryData>::~QGlobalStaticDeleter() (qglobal.h:1767) ==13197== by 0x5FE16DE: __run_exit_handlers (exit.c:78) ==13197== by 0x5FE174E: exit (exit.c:100) ==13197== by 0x5FCBA3D: (below main) (libc-start.c:252) ==13197== Address 0x0 is not stack'd, malloc'd or (recently) free'd
| * Fix trivial QList detaching: QListData::detach2() *must* memcpy.Thiago Macieira2009-08-211-1/+1
| | | | | | | | | | | | Qt 4.5 did that and the node_copy function depended on it. I have some patches from Lars that introduce detach3() and try to improve performance a bit more.
| * QMetaObject: Crashes with dbus that tries to connect to all signalsOlivier Goffart2009-08-211-12/+20
| | | | | | | | | | | | | | The compatibility method QMetaObject::connect did not handle the signal_index = -1 to connect to all signal Reviewed-by: Thiago
* | Fix obsolete license headers.Jason McDonald2009-08-2120-23/+23
|/ | | | Reviewed-by: Trust Me
* Fix crash at program exit: Q_GLOBAL_STATIC is zeroed.Thiago Macieira2009-08-211-1/+2
| | | | | | | When libraryData() is 0, &libraryData()->map is 0x4. So make sure we return 0 if libraryData() is null too. Reviewed-by: TrustMe
* Add QGraphicsOpacityEffect.Bjørn Erik Nilsen2009-08-213-0/+92
| | | | | | This is a common effect that many many customers have asked for. Reviewed-by: Samuel
* Revert "Remove a global destructor from QtDBus."Thiago Macieira2009-08-211-6/+4
| | | | | | | | | | | | This reverts commit 3ed5b5ebf5b360dedbba14c03f6ca5701b3b9290. That was a well-intentioned commit and technically correct, but it breaks when there are static QDBusConnection objects in something that is loaded before QtDBus (like libraries that depend on QtDBus or applications like qdbus) Since QDBusConnection is ref-counted, the last instance is supposed to disconnect. However, if we have already unloaded libdbus-1, we can't do that. Q_GLOBAL_STATICs are destroyed too soon.
* compile fix with namespaces in QGLCustomShaderStagePrivatehjk2009-08-211-0/+4
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtFriedemann Kleint2009-08-212-0/+5
|\
| * Fix drawTiledPixmap for texture_from_pixmap on X11/EGLTom Cooksey2009-08-212-0/+5
| | | | | | | | | | | | | | QGLContextPrivate::bindTextureFromNativePixmap() needs to abort if it's not allowed to return a y-inverted texture. Reviewed-by: Trustme
* | Added missing Q_ENUM/Q_FLAGS declarations for input methods.Friedemann Kleint2009-08-211-1/+2
|/ | | | Reviewed-by: axis <qt-info@nokia.com>
* Fix double drawing of background in XP scrollbarJens Bache-Wiig2009-08-211-3/+0
| | | | | | | | | | | Task-number: 259998 Reviewed-by: eskil The patch removes double drawing of SBP_LOWERTRACKVERT/HORZ as it is redundant to draw this under the gripper as well as on the bar itself. It also breaks for certain non-standard XP themes. The patch was suggested by Jonathan Liu.
* QFSFileEngine compile fix for VS2005Joerg Bornemann2009-08-211-1/+1
| | | | Last change wasn't enough...
* Phonon compile fix for mingwThierry Bastian2009-08-215-12/+12
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-211-1/+1
|\
| * QFSFileEngine compile fix for Windows with VS2005Joerg Bornemann2009-08-211-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch 'master' of git@scm:qt/qt-s60-publicaxis2009-08-21584-3055/+28274
|\ \ | |/ |/| | | This brings support for the S60 platform into Qt.
| * Fixed compile error.axis2009-08-211-1/+1
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-2139-228/+3239
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-215-86/+211
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_unix.cpp src/corelib/plugin/qlibrary.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-2119-274/+698
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess.h
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-211-1/+1
| |\ \ \ \
| | * | | | compile.Harald Fernengel2009-08-211-1/+1
| | | | | |
| * | | | | Merge commit 'qt/master'Jason Barron2009-08-2120-91/+147
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'reviewPatches'axis2009-08-215-50/+15
| |\ \ \ \ \
| | * | | | | Revert "Fixed KERN-EXEC 3 panic on ARMV5 builds caused by combining trinary ↵axis2009-08-211-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operators and 64 bit values in QVariant. This is probably a compiler bug. Workaround is flagged with Q_CC_RVCT specific just in case, but should work for all compilers." This reverts commit 85a1f7888bd48d5857de2b7c6304a334350fd054. Conflicts: src/corelib/kernel/qvariant.cpp tests/auto/qvariant/qvariant.pro I cannot reproduce this anymore with the latest RVCT, not even in S60 3.1. RevBy: Miikka Heikkinen
| | * | | | | Switched to logical comparison instead of bitwise.axis2009-08-212-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done because I initially thought that KRequestPending was a bit flag, but it turns out it's just an int value, so == is more correct. RevBy: Iain AutoTest: Passed
| | * | | | | Fixed documentation.axis2009-08-211-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private directory is not always in C-drive. RevBy: Trust me
| | * | | | | Fixed some comments and code style issues after review.axis2009-08-213-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-212-5/+4
| |\ \ \ \ \ \
| | * | | | | | Fixing compile issue on platforms other than Symbian.Aleksandar Sasha Babic2009-08-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had a "typo", probelmatic line have be just swaped. Reviewed-by: jbarron
| | * | | | | | Remove QtScript from deployed libraries.axis2009-08-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not currently supported anymore after QtScript switched to the JavaScriptCore backend. RevBy: Trust me
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-218-88/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | compile again after mergeHarald Fernengel2009-08-218-88/+14
| | | | | | | |
| * | | | | | | Merge commit 'qt/master'Jason Barron2009-08-2114-20/+3978
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/graphicsview/graphicsview.pro
| * | | | | | | compile again after QESDP fixHarald Fernengel2009-08-211-1/+1
| | | | | | | |
generated by cgit v0.12 at 2025-02-02 02:17:19 (GMT)