summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-188-27/+76
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake: Add support for Clang-style precompiled headers mkspecs: Refactor precompiled-header configuration out of gcc-base(-mac)
| * qmake: Add support for Clang-style precompiled headersTor Arne Vestbø2010-10-182-17/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The config option clang_pch_style will ensure that QMAKE_PCH_OUTPUT_BASE will not have QMAKE_PCH_OUTPUT_EXT appended, but instead the final output file QMAKE_PCH_OUTPUT will have the QMAKE_PCH_OUTPUT_EXT included. Without clang_pch_style: QMAKE_PCH_OUTPUT_BASE = .pch/debug-shared/QtCore.gch QMAKE_PCH_OUTPUT = .pch/debug-shared/QtCore.gch/c++ With clang_pch_style: QMAKE_PCH_OUTPUT_BASE = .pch/debug-shared/QtCore QMAKE_PCH_OUTPUT = .pch/debug-shared/QtCore/c++.gch Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * mkspecs: Refactor precompiled-header configuration out of gcc-base(-mac)Tor Arne Vestbø2010-10-186-10/+20
| | | | | | | | | | | | Preparation for introducing Clang-style precompiled-header support. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-185-4/+13
|\ \ | |/ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_moc: Include the right files for Clang and LLVM Add a few default-constructors to comply with C++'03 [dcl.init] p9 Help the compiler look up erase() and insert() in Q3ValueVector Explicitly inherit from NSOpenSavePanelDelegate on Mac OS 10.6 and above
| * tst_moc: Include the right files for Clang and LLVMTor Arne Vestbø2010-10-181-1/+1
| | | | | | | | | | | | | | | | We #include "os9-newlines.h" and "win-newlines.h" if Q_CC_GNU is defined, which is the case for Clang and LLVM, so we have to also include the headers in the pro file to run moc on them. Reviewed-by: Fabien Freling <fabien.freling@nokia.com>
| * Add a few default-constructors to comply with C++'03 [dcl.init] p9Tor Arne Vestbø2010-10-182-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++'03 [dcl.init] p9 says: "If no initializer is specified for an object, and the object is of (possibly cv-qualified) non-POD class type (or array thereof), the object shall be default-initialized; if the object is of const-qualified type, the underlying class type shall have a user-declared default constructor." QXmlStreamAttributes and a few classes in the QXmlQuery test were missing them. Relevant GCC and Clang bugs: - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42844 - http://llvm.org/bugs/show_bug.cgi?id=6772 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Help the compiler look up erase() and insert() in Q3ValueVectorTor Arne Vestbø2010-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Q3ValueVector test failed to compiled with Clang, giving: q3valuevector.h:87:13: error: use of undeclared identifier 'erase' erase(this->begin() + n, this->end()); ^ this-> Clang version 2.9 (git://repo.or.cz/clang.git c81d9e3c34b) Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: David Faure <faure@kde.org>
| * Explicitly inherit from NSOpenSavePanelDelegate on Mac OS 10.6 and aboveTor Arne Vestbø2010-10-181-1/+7
|/ | | | | | Prior to Mac OS 10.6 this was an informal protocol. Reviewed-by: Morten Sørvig
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-151-1/+1
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Adds support for sun-libiconv to plugins.pro
| * Adds support for sun-libiconv to plugins.proMartin Pejcoch2010-10-151-1/+1
| | | | | | | | | | | | | | | | Some Solaris machines are using sun-libiconv, which can also be used to compile the plugins. Task-number: QTBUG-14176 Reviewed-by: Thiago
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-1517-46/+47
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Explicitly inherit QNSOpenSavePanelDelegate from NSOpenSavePanelDelegate" Fix the build on Mac OS X after 24e0f64b8a3 removed obsolete -qt-gif configure option Apply WebKit revision 60451 manually to fix Clang build issue Rename a few QtScript debugger-classes in anonymouse namespaces Don't assign id<NSApplicationDelegate> to NSObject*, use id instead Phonon: Export ObjectDescriptionModel to prevent link errors with Clang Don't use 'id' as variable name, it has special meaning in Objctive-C Don't redeclare voidPtr, it's already declared in CarbonCore's Thread.h Explicitly inherit QNSOpenSavePanelDelegate from NSOpenSavePanelDelegate Don't assing 'const Foo*' to a 'Foo*'
| * Revert "Explicitly inherit QNSOpenSavePanelDelegate from ↵Tor Arne Vestbø2010-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | NSOpenSavePanelDelegate" This reverts commit 24e0f64b8a35ddbfeae2f0611d3f1779fb56cdb0. NSOpenSavePanelDelegate is not available on Mac OS X 10.5. Reverting this until a solution can be found so that the staging area is not blocked.
| * Fix the build on Mac OS X after 24e0f64b8a3Tor Arne Vestbø2010-10-151-0/+1
| |
| * removed obsolete -qt-gif configure optionMark Brand2010-10-152-9/+3
| | | | | | | | | | | | | | | | | | Since "-system-gif" is not offered, offering "-qt-gif" is unnecessary and perhaps misleading. By default the GIF handler is built from code included with Qt, unless suppressed by "-no-gif". Merge-request: 859 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Apply WebKit revision 60451 manually to fix Clang build issueTor Arne Vestbø2010-10-151-1/+1
| | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=39945 This revision is already present in QtWebKit 2.1
| * Rename a few QtScript debugger-classes in anonymouse namespacesTor Arne Vestbø2010-10-153-12/+12
| | | | | | | | | | | | | | Workaround for Clang bug http://llvm.org/bugs/show_bug.cgi?id=8192 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Don't assign id<NSApplicationDelegate> to NSObject*, use id insteadTor Arne Vestbø2010-10-151-1/+1
| | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Phonon: Export ObjectDescriptionModel to prevent link errors with ClangTor Arne Vestbø2010-10-152-1/+7
| | | | | | | | Workaround for http://llvm.org/bugs/show_bug.cgi?id=8177
| * Don't use 'id' as variable name, it has special meaning in Objctive-CTor Arne Vestbø2010-10-151-2/+2
| | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Don't redeclare voidPtr, it's already declared in CarbonCore's Thread.hTor Arne Vestbø2010-10-151-8/+8
| | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Explicitly inherit QNSOpenSavePanelDelegate from NSOpenSavePanelDelegateTor Arne Vestbø2010-10-151-1/+1
| | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Don't assing 'const Foo*' to a 'Foo*'Tor Arne Vestbø2010-10-155-12/+12
| | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-1357-563/+453
|\ \ | |/ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: configure: Don't assume that QMAKE_CXX will be found at the start of line Refactor GCC mkspecs to share more configuration options Add manual test for mkspecs to visualize the effect of the final config
| * configure: Don't assume that QMAKE_CXX will be found at the start of lineTor Arne Vestbø2010-10-131-1/+1
| | | | | | | | | | | | | | Change 86636e0c4ab introduced "isEmpty(QMAKE_CXX): QMAKE_CXX = g++" instead of "QMAKE_CXX = g++", which failed when configure was looking for QMAKE_CXX at the beginning of the line. We now allow either the beginning of the line or a space before QMAKE_CXX.
| * Refactor GCC mkspecs to share more configuration optionsTor Arne Vestbø2010-10-1351-562/+383
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The g++ and llvm mkspecs now share the common parts in common/gcc-base.conf Each top level mkspec includes a platform-specific version of this base, either common/gcc-base-unix.conf or common/gcc-base-mac.conf, and these platform specific bases will include the cross-platform one. The same pattern is then used for the g++ specific configurations, which are split up into common/g++.conf, common/g++-unix.conf and common/g++-mac.conf The qplatformdefs.h for mac was also shared where possible. The test in tests/manual/mkspecs was used to ensure that the final output of all the mkspecs was the same after the refactoring as before. Reviewed-by: ossi
| * Add manual test for mkspecs to visualize the effect of the final configTor Arne Vestbø2010-10-135-0/+69
| | | | | | | | Reviewed-by: ossi
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-131-1/+1
|\ \ | |/ | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Disable selection of Libraries on Windows 7 in getExistingDirectory().
| * Disable selection of Libraries on Windows 7 in getExistingDirectory().Prasanth Ullattil2010-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The Libraries on Windows 7 are user-defined collection of folders, which is only a logical representation. There are no file system entries associated with it . This patch makes sure that user cannot choose a library when using the QFileDialog::getExistingDirectory(), in such cases it will show a standard windows warning message. Task-number: QTBUG-12655 Reviewed-by: Thierry Bastian
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-131-1/+2
|\ \ | |/ | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix potential crash in case we had opened pages but run now without docs.
| * Fix potential crash in case we had opened pages but run now without docs.kh12010-10-131-1/+2
|/
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-124-16/+4
|\ | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Revert "Don't define highp/mediump/lowp if desktop GL has them"
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-124-16/+4
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-124-16/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Don't define highp/mediump/lowp if desktop GL has them"
| | | * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-124-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd. The GL_ARB_ES2_compatibility extension does not mention the lowp, mediump or highp keywords. Task-number: QTBUG-14384 Reviewed-by: Samuel Reviewed-by: Prasanth
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-122-89/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Making the hybrid allocator change compatible across all 4.7.x"
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-122-89/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Making the hybrid allocator change compatible across all 4.7.x"
| | * | | Revert "Making the hybrid allocator change compatible across all 4.7.x"mread2010-10-122-89/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c27f1586d7c4c56af1f46fa09ad77f03b7736e5d. The change to make the hybrid allocator change compatible across all 4.7.x releases is not needed after 4.7. The exported function added for the hybrid allocator will always be present now.
* | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-122-3/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3 Crash fix when using the runtime graphics system on Symbian.
| * \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-122-3/+13
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-122-3/+13
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3 Crash fix when using the runtime graphics system on Symbian.
| | | * | | | Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3Jason Barron2010-10-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S^3 does not have a client side API to support semi-transparent EGL surfaces so if this flag is enabled for a particular widget, then we should return a raster surface instead of a VG surface. Raster surfaces can still be semi-transparent but will be slower to render to. Task-number: QTBUG-14400 Reviewed-by: Jani Hautakangas Reviewed-by: Gareth Stockwell Reviewed-by: Sami Merila
| | | * | | | Crash fix when using the runtime graphics system on Symbian.Jason Barron2010-10-121-3/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QWidget::destroy() is called (perhaps by setParent) then the window surface is deleted by the destructor of QSymbianControl instead of in the "normal" place which is ~QWidget(). This means that we should not attempt to use the RWindow in the window surface because it is in the process of being destroyed. Reviewed-by: Jani Hautakangas
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-124-13/+45
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix text position with OpenGL engine and Freetype
| * | | | | Fix text position with OpenGL engine and FreetypeEskil Abrahamsen Blomfeldt2010-10-124-13/+45
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you use the OpenGL engine, the left bearing of the glyph was incorrectly retrieved from the system as the glyph was queried with the wrong format, and adjustments for antialiasing were not applied. To make the position identical to painting with, new API was added to QFontEngine (The bounding box of a glyph is also not logically necessarily the same thing as the bounding box of the rasterized glyph.) Done-with: Trond Task-number: QTBUG-14410
* | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-123-7/+13
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Compile fix for OpenVG without VGFont.
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-123-7/+13
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-123-7/+13
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile fix for OpenVG without VGFont.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-113-7/+13
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile fix for OpenVG without VGFont.
| | | | * | Compile fix for OpenVG without VGFont.Samuel Rødal2010-10-113-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ShivaVG doesn't have VGFont support for example. Reviewed-by: Jason Barron
* | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-120-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Added qmake check for presence of RHttpDownloadMgr header qmediaplayer: show buffer status of 0% Progressive download in Phonon MMF backend: integrated with player Progressive download in Phonon MMF backend: added download managers
generated by cgit v0.12 at 2025-01-10 17:32:20 (GMT)