summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile on ARM with -Werror -Wold-style-castBradley T. Hughes2010-03-151-2/+2
| | | | | | | | The C-style casts for the qt_atomic_eabi_cmpxchg_*() functions cause warnings when -Wold-style-cast is enabled. Use reinterpret_cast instead. Task-number: QTBUG-3933
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Denis Dzyubenko2010-03-152-4/+10
|\ | | | | | | 4.7-staging1
| * Apply the stdset attribute for resource propertiesJarek Kobus2010-03-151-3/+8
| | | | | | | | | | | | | | | | In case of resource property we recreate a dom property using resource builder. We had forgot to apply stdset attribute for that case. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-8881
| * doc: Completed sentence about HideNameFilterDetailsThorbjørn Lindeijer2010-03-151-1/+2
| | | | | | | | Reviewed-by: David Boddie
* | Use the vista-style native dialog for QFileDialog::getExistingDirectoryJohn Brooks2010-03-151-0/+62
|/ | | | | | | | | | Use IFileOpenDialog with FOS_PICKFOLDERS instead of SHBrowseForFolder as the native directory browse dialog on Vista. This provides a much better UI and is consistent with Vista UX. Old behavior is retained for pre-vista systems. Merge-request: 488 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Doc fix in QLocaleDenis Dzyubenko2010-03-151-1/+1
| | | | | | | Removed a link to an obsolete (Qt 3 support) function QTextCodec::locale. Task-number: related to QTBUG-8973 Reviewed-by: trustme
* Doc for for QGestureRecognizer::create.Denis Dzyubenko2010-03-151-0/+2
| | | | Reviewed-by: trustme
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-15468-12080/+24795
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Fix broken setCollectionFile (creating multiple models instead reusing) Enable the fast paths when converting to Rgb565 qdoc: ifdefed out all the debug code. Add missing QtScript API shims Further fix license whitespace. Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. Fix up whitespace in license headers. Fix SetDialogPreference build error on Symbian. get known wifi networks a more complicated way, but without accessing Only enable BM by default in QNAM for appropriate platforms. fix crash on 10.6 with no wifi interface Fix creation of QNetworkSession. Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe. remove qt_winQString2MB() and qt_winMB2QString() Fix include() path in qimportbase.pri Fix qmake crash on Windows Compile ...
| * Fix broken setCollectionFile (creating multiple models instead reusing)kh12010-03-153-10/+13
| | | | | | | | Reviewed-by: ck
| * Enable the fast paths when converting to Rgb565Benjamin Poulain2010-03-151-4/+4
| | | | | | | | | | | | | | | | | | | | The generic conversion is too slow for conversions to RGB565, which are common on embedded platforms (e.g.: Maemo). This patch enable the fast path for all conversion to rgb_565, it is a follow-up of 7d7a85fa16b28fdba257bb466be5a6d2b4bf5d2f Reviewed-by: Tom Cooksey
| * qdoc: ifdefed out all the debug code.Martin Smith2010-03-159-9/+17
| | | | | | | | | | I think the crash that occurs when running qdoc over multiple qdocconf files is fixed.
| * Add missing QtScript API shimsKent Hansen2010-03-152-0/+4
| | | | | | | | Need shims wherever a JSC::Identifier can be created/destroyed.
| * Further fix license whitespace.Morten Johan Sørvig2010-03-151-40/+39
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-15467-12063/+24764
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (56 commits) Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. Fix up whitespace in license headers. Fix SetDialogPreference build error on Symbian. get known wifi networks a more complicated way, but without accessing Only enable BM by default in QNAM for appropriate platforms. fix crash on 10.6 with no wifi interface Fix creation of QNetworkSession. Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe. remove qt_winQString2MB() and qt_winMB2QString() Fix include() path in qimportbase.pri Fix qmake crash on Windows Compile Revert some unfinished changes. Fix compilation with namespaced Qt Add a placeholder text into the new search lineedit Ui improvements to QDBusViewer. Make double-clicking a d-bus method work again ...
| | * Remove NetworkManager test-bed application.Aaron McCarthy2010-03-158-1803/+0
| | |
| | * Remove configure test for NetworkManager.Aaron McCarthy2010-03-154-70/+1
| | | | | | | | | | | | | | | | | | | | | The NetworkManager plugin for Brearer Management no longer has a compile time dependency on NetworkManager. Task-number: QTBUG-9005
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-12457-10278/+24851
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. Fix up whitespace in license headers. Fix SetDialogPreference build error on Symbian. get known wifi networks a more complicated way, but without accessing Only enable BM by default in QNAM for appropriate platforms. fix crash on 10.6 with no wifi interface Fix creation of QNetworkSession. Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe. remove qt_winQString2MB() and qt_winMB2QString() Fix include() path in qimportbase.pri Fix qmake crash on Windows Compile Revert some unfinished changes. Fix compilation with namespaced Qt Add a placeholder text into the new search lineedit Ui improvements to QDBusViewer. Make double-clicking a d-bus method work again Changed Qdbusviewer to match D-Bus type signature in addition to method name when finding a method. qdoc: Added debug code. ...
| | | * Fix QDir::entryList regressionJoão Abecasis2010-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in aa235c3cf623f832c01df9a4065375ca610d4d06 introduced a slight change in behavior where read-only files would be checked for write-access with _waccess. The real fix, however, is to follow what is done in doStat and de-reference .lnk links when checking access rights.
| | | * Add DEFINES to mingw32/windres.exe command line.Robert Griebl2010-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake didn't add $DEFINES to the windres.exe command line, while it was added to the rc.exe command line. Task-number: QTBUG-7773 Reviewed-by: Marius Storm-Olsen
| | | * Fix up whitespace in license headers.Qt Continuous Integration System2010-03-127-273/+273
| | | | | | | | | | | | | | | | Reviewed-by: Trustme
| | | * Fix SetDialogPreference build error on Symbian.Morten Johan Sørvig2010-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | Similar to 032d4ac63687d209ffef594bf6ef60e3db20bfa3.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-12455-10275/+24848
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits) get known wifi networks a more complicated way, but without accessing Only enable BM by default in QNAM for appropriate platforms. fix crash on 10.6 with no wifi interface Fix creation of QNetworkSession. Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe. remove qt_winQString2MB() and qt_winMB2QString() Fix include() path in qimportbase.pri Fix qmake crash on Windows Compile Revert some unfinished changes. Fix compilation with namespaced Qt Add a placeholder text into the new search lineedit Ui improvements to QDBusViewer. Make double-clicking a d-bus method work again Changed Qdbusviewer to match D-Bus type signature in addition to method name when finding a method. qdoc: Added debug code. Update separate regions instead of their bounding box. doc: Fixed three new qdoc errors. Autotest: make the qabstractslider test pass on mac Compile ...
| | | | * get known wifi networks a more complicated way, but without accessingLorn Potter2010-03-122-102/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the keychain. Users will still see the keychain prompt when attempting to connect/associate with a wifi network.
| | | | * Only enable BM by default in QNAM for appropriate platforms.Aaron McCarthy2010-03-124-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bearer Management is of little use on desktop platforms. Change QNetworkAccessManager to only create a QNetworkSession for the default configuration on platorms where it is useful (Symbian & Maemo). On other platforms Bearer Management is still available, but needs to be explicitly enabled by the application developer by calling QNetworkAccessManager::setConfiguration(). Use of Bearer Management by default from QNetworkAccessManager is controlled by the QT_QNAM_BEARERMANAGEMENT_ENABLED define.
| | | | * fix crash on 10.6 with no wifi interfaceLorn Potter2010-03-122-5/+16
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8954
| | | | * Fix creation of QNetworkSession.Aaron McCarthy2010-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QNAM::setConfiguration(QNetworkConfiguration()) is called before the first network request is processed new session using the default configuration would be incorrectly created.
| | | | * Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe.Aaron McCarthy2010-03-1122-329/+818
| | | | |
| | | | * remove qt_winQString2MB() and qt_winMB2QString()Oswald Buddenhagen2010-03-113-102/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | absorb qt_winQString2MB() code directly into the QTextCodec code Acked-by: thiago
| | | | * Fix include() path in qimportbase.priJoão Abecasis2010-03-111-1/+1
| | | | |
| | | | * Fix qmake crash on WindowsJoão Abecasis2010-03-111-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in aa235c3cf623f832c01df9a4065375ca610d4d06. _waccess doesn't support the X_OK mode. Instead, rely solely on the file extension as was done previously. This is also inline with what was done in QFileInfo.
| | | | * CompileKent Hansen2010-03-111-1/+1
| | | | |
| | | | * Revert some unfinished changes.Fabien Freling2010-03-111-16/+22
| | | | |
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-11425-9749/+23704
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits) Fix compilation with namespaced Qt Add a placeholder text into the new search lineedit Ui improvements to QDBusViewer. Make double-clicking a d-bus method work again Changed Qdbusviewer to match D-Bus type signature in addition to method name when finding a method. qdoc: Added debug code. Update separate regions instead of their bounding box. doc: Fixed three new qdoc errors. Autotest: make the qabstractslider test pass on mac Compile Mac: scroll speed does not match native applications qdoc: Fixed lookup of QML property nodes. configure.exe: Fix inverted logic Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+Insert Compile QtScript: Improve performance of type resolution when calling slots Improve performance of QScriptValueIterator Add default argument values for QScriptValuePrivate property functions Move method implementation to private class Add benchmarks for QScriptValueIterator ...
| | | | | * Fix compilation with namespaced QtKent Hansen2010-03-111-3/+3
| | | | | |
| | | | | * Add a placeholder text into the new search lineeditHarald Fernengel2010-03-111-0/+1
| | | | | |
| | | | | * Ui improvements to QDBusViewer.Stephen Kelly2010-03-112-32/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add resizeable splitters instead of layouts to divide up the screen. * Add a filtering line edit to find services of interest. Merge-request: 2304 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | | | | * Make double-clicking a d-bus method work againHarald Fernengel2010-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last merge request forgot to update the D-Bus structure in case of double-click.
| | | | | * Changed Qdbusviewer to match D-Bus type signature in addition to method name ↵Kimmo Kotajärvi2010-03-114-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when finding a method. Merge-request: 435 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-111-24/+18
| | | | | |\
| | | | | | * Update separate regions instead of their bounding box.Fabien Freling2010-03-111-24/+18
| | | | | | |
| | | | | * | qdoc: Added debug code.Martin Smith2010-03-116-0/+7
| | | | | |/
| | | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-115-8/+41
| | | | | |\
| | | | | | * Autotest: make the qabstractslider test pass on macRichard Moe Gustavsen2010-03-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we changed the behaviour for scrolling on mac to not be restriced to an upper limit (pagestep), we need to adjust the auto test accordingly Rev-by: prasanth
| | | | | | * CompileKent Hansen2010-03-111-0/+4
| | | | | | |
| | | | | | * Mac: scroll speed does not match native applicationsRichard Moe Gustavsen2010-03-113-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that we limit wheel scrolling on mac to an upper limit per event to one page. This behaviour is a bit strange in the first place, and on mac, it is just wrong. Besides, even when this limitation is removed, we still scroll a bit slower that native. The 'problem' is to come up with a good conversion from pixel scrolling to line based scrolling (Qt does not really have an API for pixel scrolling). But we up the speed a bit to make it perform more similar to xcode. Rev-by: msorvig
| | | | | * | doc: Fixed three new qdoc errors.Martin Smith2010-03-114-6/+7
| | | | | |/
| | | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-11488-10252/+26813
| | | | | |\
| | | | | | * configure.exe: Fix inverted logicMarius Storm-Olsen2010-03-112-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Rohan McGovern
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-11404-9677/+23523
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+Insert Compile QtScript: Improve performance of type resolution when calling slots Improve performance of QScriptValueIterator Add default argument values for QScriptValuePrivate property functions Move method implementation to private class Add benchmarks for QScriptValueIterator Fixed the QML browser built into the QML viewer Make configure.exe fail for declarative if no script support Add QWidget::update() test. Add license headers Import static contents tests from old manualtests Fix Build Failure for Maemo 5 Debug Build Add ability to read last mod.time for zip entry. Avoid asserting when index passed to QZipReader::entryInfoAt is out of boundaries Add isValid() method to QZipReader::FileInfo. Add `QIODevice* device() const` public method to QZip classes. Rebuild configure.exe (again enable QtDeclarative module by default) Update src/3rdparty/javascriptcore and adapt src/script to the changes Use index-based approach for iterating over JS array properties ...
| | | | | | | * Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+InsertThiago Macieira2010-03-105-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On X11, this key is reserved for pasting the text selection (a.k.a. the PRIMARY selection). KDE apps already honour this, not all GNOME ones do, but it was agreed with them on xdg@freedesktop.org. Reviewed-By: mae <qt-info@nokia.com>