summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed an MSVC 9.0 /2008 warningAlessandro Portale2009-08-211-5/+5
| | | | Reviewed-By: Harald Fernengel
* Fix obsolete license headers.Jason McDonald2009-08-2119-210/+551
| | | | Reviewed-by: Trust Me
* Add missing license headers and header guards.Jason McDonald2009-08-215-5/+199
| | | | Reviewed-by: Trust Me
* Fix obsolete license headers.Jason McDonald2009-08-2125-52/+52
| | | | Reviewed-by: Trust Me
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJason McDonald2009-08-2115-17/+23
|\
| * Using pnginfo and optipng to reduce file size (thus resources size).Alessandro Portale2009-08-2111-0/+0
| |
| * 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-2123-28/+28
|/ | | | Reviewed-by: Trust Me
* Use relative paths in DESTDIR in qdoc3.pro.Thiago Macieira2009-08-211-1/+1
| | | | | | | | When mkdist builds qdoc, it uses a shadow build outside Qt's build. So .qmake.cache is not present. That led qmake to try and write to /bin, which would obviously fail. Reviewed-by: TrustMe
* 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
* Don't try to use -rpath to support link-time library searching.Thiago Macieira2009-08-211-2/+0
| | | | | | This is breaking the MacOS X build because -rpath is a supported option, but it conflicts with others (namely -mmacosx-version-min=10.4). So it's causing the Mac build to fail.
* Doc: Added the What's New page for 4.6Geir Vattekar2009-08-215-5/+178
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtmasterEspen Riskedal2009-08-213-0/+92
|\
| * 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
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtmasterEspen Riskedal2009-08-218-8/+25
|\ \ | |/
| * 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
| |
| * make moc, qregion and qsharedpointer autotest compile with namespaceshjk2009-08-215-1/+15
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtFriedemann Kleint2009-08-212-0/+5
| |\
| * | Added missing Q_ENUM/Q_FLAGS declarations for input methods.Friedemann Kleint2009-08-211-1/+2
| | | | | | | | | | | | Reviewed-by: axis <qt-info@nokia.com>
* | | renamed examplebase.pri to symbianpkgrules.priEspen Riskedal2009-08-21241-326/+357
| |/ |/| | | | | | | | | | | | | examplesbase.pri sounded to generic and it was not obvious that this was only for Symbian. Also merged the different symbian rules if they were spread around in the .pro file. Reviewed-by: Aleksandar Sasha Babic
* | 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
* 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-211534-6350/+94573
|\ \ | |/ |/| | | This brings support for the S60 platform into Qt.
| * Fixed compile error.axis2009-08-211-1/+1
| |
| * Merge branch 'master' of git@scm:qt/qt-s60-public into master-s60axis2009-08-211-12/+0
| |\
| | * remove the old .pri files, forgotEspen Riskedal2009-08-211-12/+0
| | |
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-2190-228/+5506
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-216-112/+249
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 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-2123-285/+737
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess.h
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-2128-44/+63
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicEspen Riskedal2009-08-211-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Harald Fernengel2009-08-217-58/+42
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | master-origin
| | | * | | | | compile.Harald Fernengel2009-08-211-1/+1
| | | | | | | |
| | * | | | | | Rename demobase.pri to symbianpkgrules.priEspen Riskedal2009-08-2127-43/+62
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | demobase.pri sounded to generic, also I changed it to error on !symbian platforms, and test all the places we include it. That makes it more obvious when reading the .pro files that this is actually Symbian spesific stuff, not cross-platform Qt rules. Reviewed-by: axis
| * | | | | | Merge commit 'qt/master'Jason Barron2009-08-2138-200/+325
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Remove changes from bad merge.Jason Barron2009-08-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was related to e93ffdbb6fde611defc34fd27aec25c40da5a60e. Again, this most likely happened when switching between 4.5 and 4.6 and resolving some conflict incorrectly.
| * | | | | | Remove commented-out code from examples.axis2009-08-211-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| * | | | | | Removed an example that was listed twice.axis2009-08-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Espen Riskedal
| * | | | | | Fixes: Missing deployment of backends for phonon examplesaxis2009-08-212-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Joerg Details: deployment of waveout and direct show backend Conflicts: examples/phonon/capabilities/capabilities.pro examples/phonon/musicplayer/musicplayer.pro (Cherry-pick of d6cfcd22472128cc68c75a7e24791a909082732f)
| * | | | | | Revisiting test cases.Aleksandar Sasha Babic2009-08-211-48/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some values (timeouts) could be trimmed to be the same as on the other platforms. Others are different as we have to remember that Symbina is embedded pltform and that usually tests run in the emulator. Things need more time then. Reviewed-by: TrustMe
| * | | | | | Rebuild configure.exe.Jason Barron2009-08-211-0/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | This binary was built with MSVC2008 and the /MT option.
| * | | | | Merge branch 'reviewPatches'axis2009-08-215-50/+15
| |\ \ \ \ \
generated by cgit v0.12 at 2025-02-22 07:28:36 (GMT)