summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-188-27/+76
|\
| * qmake: Add support for Clang-style precompiled headersTor Arne Vestbø2010-10-182-17/+56
| * mkspecs: Refactor precompiled-header configuration out of gcc-base(-mac)Tor Arne Vestbø2010-10-186-10/+20
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-185-4/+13
|\ \ | |/
| * tst_moc: Include the right files for Clang and LLVMTor Arne Vestbø2010-10-181-1/+1
| * Add a few default-constructors to comply with C++'03 [dcl.init] p9Tor Arne Vestbø2010-10-182-0/+3
| * Help the compiler look up erase() and insert() in Q3ValueVectorTor Arne Vestbø2010-10-181-2/+2
| * Explicitly inherit from NSOpenSavePanelDelegate on Mac OS 10.6 and aboveTor Arne Vestbø2010-10-181-1/+7
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-151-1/+1
|\
| * Adds support for sun-libiconv to plugins.proMartin Pejcoch2010-10-151-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-1517-46/+47
|\ \ | |/ |/|
| * Revert "Explicitly inherit QNSOpenSavePanelDelegate from NSOpenSavePanelDeleg...Tor Arne Vestbø2010-10-151-1/+1
| * 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
| * Apply WebKit revision 60451 manually to fix Clang build issueTor Arne Vestbø2010-10-151-1/+1
| * Rename a few QtScript debugger-classes in anonymouse namespacesTor Arne Vestbø2010-10-153-12/+12
| * Don't assign id<NSApplicationDelegate> to NSObject*, use id insteadTor Arne Vestbø2010-10-151-1/+1
| * Phonon: Export ObjectDescriptionModel to prevent link errors with ClangTor Arne Vestbø2010-10-152-1/+7
| * Don't use 'id' as variable name, it has special meaning in Objctive-CTor Arne Vestbø2010-10-151-2/+2
| * Don't redeclare voidPtr, it's already declared in CarbonCore's Thread.hTor Arne Vestbø2010-10-151-8/+8
| * Explicitly inherit QNSOpenSavePanelDelegate from NSOpenSavePanelDelegateTor Arne Vestbø2010-10-151-1/+1
| * Don't assing 'const Foo*' to a 'Foo*'Tor Arne Vestbø2010-10-155-12/+12
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-1357-563/+453
|\ \ | |/
| * configure: Don't assume that QMAKE_CXX will be found at the start of lineTor Arne Vestbø2010-10-131-1/+1
| * Refactor GCC mkspecs to share more configuration optionsTor Arne Vestbø2010-10-1351-562/+383
| * Add manual test for mkspecs to visualize the effect of the final configTor Arne Vestbø2010-10-135-0/+69
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-131-1/+1
|\ \ | |/
| * Disable selection of Libraries on Windows 7 in getExistingDirectory().Prasanth Ullattil2010-10-131-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-131-1/+2
|\ \ | |/
| * 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 scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-124-16/+4
|\
| * 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 4.7-integ...Qt Continuous Integration System2010-10-124-16/+4
| | |\
| | | * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-124-16/+4
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-122-89/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-122-89/+1
| |\ \ \
| | * | | Revert "Making the hybrid allocator change compatible across all 4.7.x"mread2010-10-122-89/+1
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-122-3/+13
|\ \ \ \ \
| * \ \ \ \ 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 4.7-integr...Qt Continuous Integration System2010-10-122-3/+13
| | |\ \ \ \
| | | * | | | Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3Jason Barron2010-10-121-0/+8
| | | * | | | Crash fix when using the runtime graphics system on Symbian.Jason Barron2010-10-121-3/+5
| | |/ / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-124-13/+45
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix text position with OpenGL engine and FreetypeEskil Abrahamsen Blomfeldt2010-10-124-13/+45
| | |_|/ / | |/| | |
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-123-7/+13
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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 4.7-integ...Qt Continuous Integration System2010-10-123-7/+13
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-113-7/+13
| | | |\ \
| | | | * | Compile fix for OpenVG without VGFont.Samuel Rødal2010-10-113-7/+13
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-120-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |