summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-17494-12171/+25150
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) probably need to update user configurations once in a while too use dynamicstore instead Define JS_NO_EXPORT to avoid JSC C API functions being exported Don't use QScriptValueIterator to iterate over an array QtScript: Fix regression when calling newQObject() from native constructor Added note to OS X installation instructions. Keypress events ignored in listview on Cocoa (64 Bit) with Japanese IME Update only appropriate rectangles during update_sys(). Marked QTDS obsolete from Qt 4.7. QNetworkReply: Fix canReadLine() Abort waiting replies on session error. different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-17494-12171/+25150
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) probably need to update user configurations once in a while too use dynamicstore instead Define JS_NO_EXPORT to avoid JSC C API functions being exported Don't use QScriptValueIterator to iterate over an array QtScript: Fix regression when calling newQObject() from native constructor Added note to OS X installation instructions. Keypress events ignored in listview on Cocoa (64 Bit) with Japanese IME Update only appropriate rectangles during update_sys(). Marked QTDS obsolete from Qt 4.7. QNetworkReply: Fix canReadLine() Abort waiting replies on session error. different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails ...
| * probably need to update user configurations once in a while tooLorn Potter2010-03-171-1/+1
| |
| * use dynamicstore insteadLorn Potter2010-03-171-29/+14
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-16494-12171/+25165
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (81 commits) Define JS_NO_EXPORT to avoid JSC C API functions being exported Don't use QScriptValueIterator to iterate over an array QtScript: Fix regression when calling newQObject() from native constructor Added note to OS X installation instructions. Keypress events ignored in listview on Cocoa (64 Bit) with Japanese IME Update only appropriate rectangles during update_sys(). Marked QTDS obsolete from Qt 4.7. QNetworkReply: Fix canReadLine() Abort waiting replies on session error. different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails Doc fix in QLocale Doc for for QGestureRecognizer::create. ...
| | * Define JS_NO_EXPORT to avoid JSC C API functions being exportedKent Hansen2010-03-161-1/+1
| | | | | | | | | | | | | | | | | | script.pro was defining JS_EXPORT in an attempt to avoid exporting, but JSBase.h unconditionally undefines it, and redefines based on JS_NO_EXPORT. So define that one instead.
| | * Don't use QScriptValueIterator to iterate over an arrayKent Hansen2010-03-161-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QScriptValueIterator will return properties that are non-enumerable, such as "length". QScriptValueIterator will return properties that are not array elements, such as "foo". QScriptValueIterator is slower than using index-based access, because the iterator builds an array of the string representation of each index, which we don't need.
| | * QtScript: Fix regression when calling newQObject() from native constructorKent Hansen2010-03-162-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | The thisObject passed to native constructors did not have all the new structure flags, so if it was promoted to a QObject (using the overload of newQObject() that takes an existing script object as first argument), the resulting script object did not receive dynamic property access callbacks.
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-163-11/+68
| | |\
| | | * Keypress events ignored in listview on Cocoa (64 Bit) with Japanese IMEPrasanth Ullattil2010-03-162-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When appliction is started with a Japanese input method, the keyboard layout data might not be avialble. In such cases use the unicode passed with the NSEvent. Also add key mappping support for the unicode range U+f700 to U+f747 Task-number: QTBUG-8647 Reviewed-by: Denis
| | | * Update only appropriate rectangles during update_sys().Fabien Freling2010-03-161-9/+12
| | | | | | | | | | | | | | | | | | | | Instead of updating the bounding box, we iterate over the rectangles of the region. We also keep early alien support.
| | * | Added note to OS X installation instructions.Martin Smith2010-03-161-0/+4
| | |/ | | | | | | | | | | | | | | | The iPhone simulator conflicts with the package installer. Task: QTBUG-7003
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-164-1/+33
| | |\
| | | * QNetworkReply: Fix canReadLine()Markus Goetz2010-03-164-1/+33
| | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * | Marked QTDS obsolete from Qt 4.7.Martin Smith2010-03-161-1/+5
| | |/ | | | | | | | | | Task: QTBUG-8019
| | * Abort waiting replies on session error.Aaron McCarthy2010-03-162-0/+18
| | | | | | | | | | | | | | | Abort waiting QNetworkReplys with an error on session errors. Non waiting replies will likely fail by other means (e.g. broken sockets).
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-15484-12157/+25010
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails Doc fix in QLocale Doc for for QGestureRecognizer::create. 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. ...
| | | * different approach to fixing "the other" aliasing issueOswald Buddenhagen2010-03-151-37/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of copying the original value and constructing a Node later, construct a Node immediately and copy it later. Reviewed-by: thiago
| | | * fix aliasing issue in node_construct()Oswald Buddenhagen2010-03-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invisible so far, but the next patch uncovers it. this could be possibly optimized for more compilers. however, i found no way to ask msvc whether it is doing an optimized build. Reviewed-by: thiago
| | | * detach in fewer cases, remove redundant calculationOswald Buddenhagen2010-03-151-3/+1
| | | | | | | | | | | | | | | | Reviewed-by: thiago
| | | * SSL: Fix memleak related to local certificateMarkus Goetz2010-03-155-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6504 Task-number: QTBUG-8924 Task-number: QTBUG-5645 Reviewed-by: andreas Reviewed-by: Peter Hartmann
| | | * Improve keyboard layout detection on X11Bradley T. Hughes2010-03-154-27/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the keyboard configuration includes multiple layouts in separate groups, the _XKB_RULES_NAME property lists the layouts separated by a comma. Previously we did not handle this. We query the current keyboard group on startup and monitor XkbStateNotify events for group changes. The existing infrastructre from QKeyMapper deals with sending the KeyboardLayoutChange event to all toplevel windows already. This change includes a bit of refactoring to put the XKB detection and initialization in qapplication_x11.cpp and XKB opcode, eventbase, and errorbase into qt_x11_p.h (like with the other extensions). Task-number: QTBUG-3631 Reviewed-by: denis
| | | * 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