summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed a missing * in the docs for QML_DECLARE_TYPEThorbjørn Lindeijer2011-01-261-1/+1
| | | | | | | It's actually equivalant to Q_DECLARE_METATYPE(TYPE *). This explains why it works on classes that use Q_DISABLE_COPY. Reviewed-by: David Boddie <david.boddie@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-01-2517-290/+290
|\
| * Doc: Fixing typoMorten Engvoldsen2011-01-251-1/+1
| |
| * Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-2514-15/+15
| |
| * Doc: fixing bugs and misspelling based on feedbackMorten Engvoldsen2011-01-253-274/+274
| |
* | Doc: Fixed missing images in qt demoGeir Vattekar2011-01-2510-2/+8
|/ | | | Task-number: QTBUG-14274
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-141-113/+156
|\
| * Changed the QML Elements page groupings.Jerome Pasion2011-01-141-113/+156
| | | | | | | | | | Task-number: QTBUG-16071 Reviewed-by: David Boddie
* | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1310504-16302/+25191
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-1327-43/+460
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed build failure on platforms other than Symbian Fix corelib def files. Fix qglthreads test crash on Symbian Remove sqlite3_selfsigned.sis as it is no longer usable or needed. Allow use of command line parameters with RApaLsSession::StartApp. Fixed resource leak in Phonon MMF backend Allow IAP to be selected in Phonon MMF backend
| | * | Fixed build failure on platforms other than SymbianGareth Stockwell2011-01-121-2/+8
| | | | | | | | | | | | | | | | Reviewed-by: Ruth Sadler
| | * | Fix corelib def files.Miikka Heikkinen2011-01-122-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added symbianCommandLine function to corelib def files. Task-number: QTBUG-15987 Reviewed-by: TrustMe
| | * | Fix qglthreads test crash on SymbianJani Hautakangas2011-01-121-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use less GPU memory to make tests pass and skip threaded rendering since eventually tries to access main RWindow from secondary thread, which is not allowed on Symbian Task-number: QTBUG-13525 Reviewed-by: TRUSTME
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-1124-41/+434
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3_selfsigned.sis as it is no longer usable or needed. Allow use of command line parameters with RApaLsSession::StartApp. Fixed resource leak in Phonon MMF backend Allow IAP to be selected in Phonon MMF backend
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-1124-41/+434
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3_selfsigned.sis as it is no longer usable or needed. Allow use of command line parameters with RApaLsSession::StartApp. Fixed resource leak in Phonon MMF backend Allow IAP to be selected in Phonon MMF backend
| | | * | Remove sqlite3_selfsigned.sis as it is no longer usable or needed.Miikka Heikkinen2011-01-112-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Selfsigned qt.sis no longer installs on top of sqlite3_selfsigned.sis as patching embedded sises and dependencies was removed from patch_capabilities.pl script. However, since the regular sqlite3.sis is nowadays signed for all three Symbian manufacturers that Qt supports, there is no more need to have a self-signed sqlite3.sis in the first place, so it is removed to reduce confusion. Task-number: QTBUG-16576 Reviewed-by: axis
| | | * | Allow use of command line parameters with RApaLsSession::StartApp.Miikka Heikkinen2011-01-115-25/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a Symbian application is launched using RApaLsSession::StartApp, command line parameters can be given with CApaCommandLine::SetTailEndL and will now be correctly interpreted by Qt applications as command line parameters. There are a couple of limitations: 1) The parameters given with CApaCommandLine::SetTailEndL will not be available in main method's argv array; they can be accessed via QCoreApplication::arguments function. 2) CApaCommandLine::SetTailEndL does support any arbitrary binary data as parameter, but only 8-bit string data gets parsed properly into QCoreApplication::arguments. For other kind of tail data, you need to subclass QS60MainAppUi and implement ProcessCommandParametersL callback. Task-number: QTBUG-15987 Reviewed-by: axis
| | | * | Fixed resource leak in Phonon MMF backendRuth Sadler2011-01-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16513 Reviewed-by: Gareth Stockwell
| | | * | Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-1117-14/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonon API does not provide any way for the client to specify which network connection should be used for streaming playback. If the application already has a connection open, using a bearer other than the default (e.g. using WiFi when the device default is GPRS), it may be desirable to use it for streaming, rather than allowing the Phonon backend to open a second connection on the default bearer. This patch adds a custom property on the Phonon::MediaObject, called InternetAccessPointName. The client can specify the IAP which Phonon should use by setting this property. Note that support for this property is only provided in the Phonon MMF backend. Task-number: QTBUG-11436 Reviewed-by: Gareth Stockwell
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-112-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: rebuild configure Doc: Fixed a few misspellings of Flipable
| | * | | rebuild configureOswald Buddenhagen2011-01-111-0/+0
| | | | |
| | * | | Doc: Fixed a few misspellings of FlipableThorbjørn Lindeijer2011-01-111-2/+2
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-112-2/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Install each test in a separate directory Do not override the target path if already defined Attempt to cure my pathological inability to type the word "package".
| | * | Install each test in a separate directoryAdrian Constantin2011-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It prevents collision of test data. Reviewed-by: Lucian Varlan
| | * | Do not override the target path if already definedLucian Varlan2011-01-111-1/+4
| | | | | | | | | | | | | | | | Reviewed-by: Adrian Constantin
| | * | Attempt to cure my pathological inability to type the word "package".Jason McDonald2011-01-111-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-111-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: OpenVG paint engine doesn't draw glyphs well to non-integer offsets.
| | * | | OpenVG paint engine doesn't draw glyphs well to non-integer offsets.Jani Hautakangas2011-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solution is to round adjustment offsets to integer values to prevent blurry text. Task-number: QTBUG-16240 Reviewed-by: Alessandro Portale
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-111-1/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QTextCodec::codecForMib: actually use the cache
| | * | | QTextCodec::codecForMib: actually use the cacheOlivier Goffart2011-01-111-1/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | Was removed by mistake in commit 02aecce59cb76ceb88f635203553 Reviewed-by: Peter Hartmann
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-114-585/+20
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix ConnMan bearer plugin to use new net.connman service name.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2011-01-111-4/+4
| | |\ \ | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-101-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Update QTextOdfWriter test case to match actual (correct) output
| | * | | Update QTextOdfWriter test case to match actual (correct) outputBrad Hards2011-01-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ODF 1.1 Specification Section 15.5.11 shows the element names are tab-stops and tab-stop (not style-tab-stops and style-tab-stop, which are just ref in the schema). Merge-request: 1012 Reviewed-by: Olivier Goffart
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2011-01-117-9/+56
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-1010434-10534/+10537
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFont/Windows: restrict the pixel size accuracy Update copyright year to 2011. For non-developer builds, skip test that requires private API tst_qhttpnetworkconnection: Compile fix Change QHostInfoCache to use QElapsedTime instead of QTime. Fix for qtdemo bug
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-105-3/+54
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Setting WA_TranslucentBackground after winid() is ineffective on Symbian. Fix handle leak in symbian QTimer implementation
| | * | | | | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-103-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Symbian doesn't support semi-transparent EGL surfaces. WA_TranslucentBackground attribute is ineffective if set after EGL surface creation. To enable translucency in this case we need to recreate backing store to get raster surface which supports translucency. Task-number: QT-4416 Reviewed-by: Jason Barron
| | * | | | | Fix handle leak in symbian QTimer implementationShane Kearns2011-01-102-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timer handle was only being closed when a timer was cancelled, which resulted in a leak for one shot timers that have completed normally. Instead the timer is now closed in a destructor (closing null handles is safe, so it doesn't matter if the handle was never created - e.g. in the case of a zero timer) Also added a handle check before creating a timer to prevent a leak in case the start function is called twice in the backend. Task-number: QTBUG-16380 Reviewed-by: mread
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-102-6/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash in QTextBlock::next()/previous() Fix regression in text rendering in OpenGL2 engine
| | * | | | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-01-102-6/+2
| | |\ \ \ \ | |/ / / / /
| | * | | | Fix crash in QTextBlock::next()/previous()Jiang Jiang2011-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should check not just p but also n in next()/previous(), which is what isValid() does. Otherwise n == 0 will cause crash in QFragmentMap. Task-number: QTBUG-16279 Reviewed-by: Eskil
| | * | | | Fix regression in text rendering in OpenGL2 engineEskil Abrahamsen Blomfeldt2011-01-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 532115bcaa370af827a5cbad017b272842c5aacf introduced a regression by fixing a typo in the QT_OPENGL_ES_2 macro. This caused a broken and untested code path to be used in the GLES2 case. Since the QImage scanlines are 32 bit aligned, QImage::width() cannot be used when copying the data. Rather than pass in bytesPerLine() to the GL function, I opted to revert to the proven behavior, where the pad bytes are never read by GL but each scanline is copied separately, to avoid further regressions on different hardware. This also seems like the more correct approach, as the pad bytes should ideally not be copied into the cache texture. Reviewed-by: Samuel
| | | | * | Merge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into ↵Lorn Potter2011-01-114-585/+20
| | | | |\ \ | | | |/ / / | | | | | | | | | | | | integration
| | | | * | Fix ConnMan bearer plugin to use new net.connman service name.Leena Gunda2010-12-094-585/+20
| | | | | |
| | | * | | QFont/Windows: restrict the pixel size accuracyJoerg Bornemann2011-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like on all other platforms, the pixel size accuracy is now restricted to two digits after the decimal point. Task-number: QTBUG-15688 Reviewed-by: Jiang Jiang
| | | * | | Update copyright year to 2011.Jason McDonald2011-01-1010433-10520/+10520
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | For non-developer builds, skip test that requires private APIAdrian Constantin2011-01-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build break on harmattan. Reviewed-by: Lucian Varlan
| | | * | | tst_qhttpnetworkconnection: Compile fixMarkus Goetz2011-01-101-7/+7
| | | | | |
| | | * | | Change QHostInfoCache to use QElapsedTime instead of QTime.Niklas Kurkisuo2011-01-102-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QElapsedTime instead of QTime for performance gain. See QT-2965 for more info. Task-number: QTBUG-16468 Reviewed-by: Markus Goetz