summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-166-141/+90
|\
| * Doc: Cleaning up the known issues page. Pointing people to check the online ↵Morten Engvoldsen2010-09-161-120/+5
| | | | | | | | resources.
| * Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-162-5/+53
| | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077
| * Doc: Removing section about Multimedia - playback and declarative elements. ↵Morten Engvoldsen2010-09-161-9/+0
| | | | | | | | This was descoped from Qt 4.7.
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-152-7/+32
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-151-1/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix error messages when configuring Qt
| | | * fix error messages when configuring QtJoerg Bornemann2010-09-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 019032c93b7397c7239ec99ec44b4923df31533b introduced a lot of annoying error messages when configuring Qt. It makes qmake complain that it cannot find rcc and uic, which aren't yet built at this point. We're now checking for the existence of the depend_command if it is given as absolute path. This is the case for uic and rcc. Yeah this is a weak solution for sick code. Task-number: QTBUG-13366 Reviewed-by: ossi
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-151-6/+29
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Do not wait for QThread exit when destroying global statics in Symbian
| | | * Do not wait for QThread exit when destroying global statics in SymbianMiikka Heikkinen2010-09-151-6/+29
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian kernel will kill all threads except the main one before running destructors on global static objects. Qt gets no notification of these thread terminations, so it'll still think those threads are running and will wait indefinitely for their exit. QThread::wait() now checks if the thread is actually still alive before starting to wait on thread_done wait condition. Task-number: QTBUG-13612 Reviewed-by: Janne Koskinen
* | | Doc: Updated the Mac requirements page.Geir Vattekar2010-09-161-0/+3
|/ / | | | | | | Reviewed-by: Morten Engvoldsen
* | Doc: Listed undoable operations in QTextDocumentGeir Vattekar2010-09-151-1/+12
| | | | | | | | | | Task-number: QT-1212 Reviewed-by: David Boddie
* | Doc: Note on updating proxy models with dynamic sort filtersGeir Vattekar2010-09-151-0/+8
| | | | | | | | | | Task-number: QT-689 Reviewed-by: David Boddie
* | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-1581-357/+3403
|\ \ | |/ | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-151-2/+2
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Rename "interface" in qdeclarativeinterface.h to "qmlInterface"
| | * Rename "interface" in qdeclarativeinterface.h to "qmlInterface"Rhys Weatherley2010-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The "interface" name is #define'd to "struct" in Windows COM headers in some SDK's, and creates problems when such headers are mixed with QML bindings. Reviewed-by: Joona Petrell
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-151-2/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix compile error with active perl 5.8.9 This patch enables calling createpackage script also
| | * | Fix compile error with active perl 5.8.9Shane Kearns2010-09-141-2/+3
| | | | | | | | | | | | | | | | Reviewed-by: Jani Hautakangas
| | * | This patch enables calling createpackage script alsoJani Hautakangas2010-09-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | when using EPOCROOT that contains drive letter. Reviewed-by: axis
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-142-2/+30
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix QTBUG-13501 - crash when a gesture is accepted but not consumed Add test: assert when gesture is never accepted.
| | * | fix QTBUG-13501 - crash when a gesture is accepted but not consumedJeremy Katz2010-09-141-2/+4
| | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | * | Add test: assert when gesture is never accepted.Frederik Gladhorn2010-09-141-0/+26
| | | | | | | | | | | | | | | | Test for Qt-Bug 13501.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-145-5/+34
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsWidget update issues with ItemHasNoContents + effect Fixed missing background for regular Qt applications with MeeGo system. Fix top-left corner of rounded rects in QPaintEngineEx
| | * | QGraphicsWidget update issues with ItemHasNoContents + effectBjørn Erik Nilsen2010-09-142-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Items with the ItemHasNoContents flag set are never drawn so the 'paintedViewBoundingRect' is never cached/updated resulting in updates wrongly being discarded. The solution is to always invalidate the children for such items. Auto test included. Task-number: QT-3803
| | * | Fixed missing background for regular Qt applications with MeeGo system.Samuel Rødal2010-09-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting NoSystemBackground means that top-level widget backgrounds don't get painted any more. Another work-around must be found to prevent flickering. Reviewed-by: Gunnar Sletta
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-142-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix top-left corner of rounded rects in QPaintEngineEx
| | | * | Fix top-left corner of rounded rects in QPaintEngineExGunnar Sletta2010-09-142-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Rhys Weatherley
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-147-46/+1427
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed audio-backend detection in configure tests. Added support for using -L notation in the LIBS variable. Remove redundant code in SgImage -> VGImage conversion on Symbian. Fix incorrect dialog positioning on Symbian Eliminated duplicated code from library handling. Add QtOpenGL .def files Moved the sis_targets feature profile to the correct directory.
| | * | | Merge branch 'buildSystemFixes' into 4.7-s60axis2010-09-143-16/+18
| | |\ \ \
| | | * | | Fixed audio-backend detection in configure tests.axis2010-09-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-11671 RevBy: Trust me
| | | * | | Added support for using -L notation in the LIBS variable.axis2010-09-141-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-13523 RevBy: Thomas Zander
| | | * | | Eliminated duplicated code from library handling.axis2010-09-141-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | * | | Moved the sis_targets feature profile to the correct directory.axis2010-09-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | Remove redundant code in SgImage -> VGImage conversion on Symbian.Jason Barron2010-09-141-29/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling the various Khronos getError() functions here is inefficient since it involves a round trip to the GPU and gains nothing since the null handle can be used to test for error conditions at no cost. Also no need to open the RSgDriver because we don't actually need to call any functions on RSgImage, just convert it. Reviewed-by: Alessandro Portale Reviewed-by: Jani Hautakangas
| | * | | | Fix incorrect dialog positioning on SymbianGareth Stockwell2010-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3900 Reviewed-by: Jason Barron Reviewed-by: Sami Merila
| | * | | | Add QtOpenGL .def filesJani Hautakangas2010-09-142-0/+1406
| | | |/ / | | |/| | | | | | | | | | | | Reviewed-by: TRUSTME
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-1422-93/+1414
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: L10n: Update German translations for 4.7.1, part 1. build fix for configure.exe I18n: Fix some lupdate warnings. Fix compile warnings. expose GestureType for using in QML
| | * | | L10n: Update German translations for 4.7.1, part 1.Friedemann Kleint2010-09-145-8/+1322
| | | | |
| | * | | build fix for configure.exeJoerg Bornemann2010-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-149-80/+82
| | | | |
| | * | | Fix compile warnings.Friedemann Kleint2010-09-145-5/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
| | * | | expose GestureType for using in QMLZeno Albisser2010-09-142-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-144-4/+51
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: In ParentChange treat flip in x and y as a 180 degree rotation
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-144-4/+51
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: In ParentChange treat flip in x and y as a 180 degree rotation
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-1415-162/+146
| | | |\ \ \
| | | * | | | In ParentChange treat flip in x and y as a 180 degree rotationMartin Jones2010-09-144-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two are equivalent, but flip doesn't work in ParentChange. Task-number: QTBUG-13554 Reviewed-by: Michael Brasser
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-1439-200/+433
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) Make compile. run depend_command even if the binary has no absolute path fix scaleFactor/totalScaleFactor in QPinchGestureRecognizer Added velocity property to the QPanGesture. Changed the speed property on QSwipeGesture to velocity fix typos in comment unbreak test Don't add generic subdirs project twice. Remove debug, quiet warnings. Fix memory leaks and valgrind errors. QStroker: Fix erroneous SvgMiterJoin behavior for parallel lines Revert "Properly implement qobject_cast for const pointers." Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF ...
| | * | | | Make compile.Aaron McCarthy2010-09-141-1/+1
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-1439-200/+433
| | |\ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) run depend_command even if the binary has no absolute path fix scaleFactor/totalScaleFactor in QPinchGestureRecognizer Added velocity property to the QPanGesture. Changed the speed property on QSwipeGesture to velocity fix typos in comment unbreak test Don't add generic subdirs project twice. Remove debug, quiet warnings. Fix memory leaks and valgrind errors. QStroker: Fix erroneous SvgMiterJoin behavior for parallel lines Revert "Properly implement qobject_cast for const pointers." Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter ...
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-1339-200/+433
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) run depend_command even if the binary has no absolute path fix scaleFactor/totalScaleFactor in QPinchGestureRecognizer Added velocity property to the QPanGesture. Changed the speed property on QSwipeGesture to velocity fix typos in comment unbreak test Don't add generic subdirs project twice. Remove debug, quiet warnings. Fix memory leaks and valgrind errors. QStroker: Fix erroneous SvgMiterJoin behavior for parallel lines Revert "Properly implement qobject_cast for const pointers." Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter ...
| | | * | | run depend_command even if the binary has no absolute pathOswald Buddenhagen2010-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this magic is a bit braindead anyway, but whatever. Reviewed-by: joerg Task-number: QTBUG-13366
generated by cgit v0.12 at 2025-01-23 09:24:45 (GMT)