summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | QNAM: Move authentication cache to separate classMarkus Goetz2011-02-046-245/+424
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make the authentication cache thread-safe by using a mutex and making QNetworkAuthenticationCredential a value-class. Reviewed-by: thiago
| | * | | | | | tst_qnetworkreply: Relax a conditionMarkus Goetz2011-02-041-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the different buffers in Qt and the OS, we relax a condition for now.
| | * | | | | | Implement QThreadData::current using __threadOlivier Goffart2011-02-031-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It slightly faster, and QThreadData::current is used everywhere Reviewed-by: mread Reviewed-by: Joao
| | * | | | | | Crash in QFileSystemEngine::canonicalName with older libc versionOlivier Goffart2011-02-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crashed on OpenBSD. POSIX.1-2001 says that the behavior if resolved_path is NULL is implementation-defined. POSIX.1-2008 specifies that the it can be NULL Reviewed-By: Markus Goetz
| | * | | | | | Fix leak in QFactoryLoaderOlivier Goffart2011-02-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to release the library in case of errors
| | * | | | | | Fixed "not a valid preprocessing token" on GCCE.axis2011-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems to be fixed upstream already. RevBy: Gareth Stockwell
| | * | | | | | Fixed win32-msvc2008 build regression.axis2011-01-312-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We needed to move the code in the init() function to the fixTargetExt() function, which is where the variables are actually used. The reason is that fixTargetExt() runs before init(). RevBy: Miikka Heikkinen
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-3110669-56893/+38205
| | |\ \ \ \ \ \
| | * | | | | | | Fix for linux build errorShane Kearns2011-01-281-1/+1
| | | | | | | | |
| | * | | | | | | Merge branch 'windowsMakefileBuildSupport' into earth-masteraxis2011-01-2814-47/+140
| | |\ \ \ \ \ \ \
| | | * | | | | | | Made qmake strip trailing \ from libdirs.axis2011-01-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done because trailing \ would confuse the command line parser if the path was also quoted. RevBy: Oswald Buddenhagen
| | | * | | | | | | Fixed GCCE libdir handling if the paths have spaces in them.axis2011-01-281-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | * | | | | | | Added MinGW support for adding lib prefix and extension via profile.axis2011-01-284-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * | | | | | | Added support for various special compiler/linker flags on MinGW.axis2011-01-281-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables you to use QMAKE_xxx_yyy, where xxx is either CFLAGS, CXXFLAGS or LFLAGS, and yyy is either APP, SHLIB or PLUGIN. It is basically the same as the one in the UNIX generator. RevBy: Oswald Buddenhagen
| | | * | | | | | | Added support for rvct_linker config in qmake's MinGW generator.axis2011-01-281-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | * | | | | | | Avoided some MinGW specific codepaths when building Symbian libs.axis2011-01-282-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | * | | | | | | Added .lib/.dso dependency tracking to Symbian with MinGW generator.axis2011-01-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a mirror of the way the UNIX generator does it. See commits aaf189b084f52 and bdff51768dfe. RevBy: Oswald Buddenhagen
| | | * | | | | | | Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.axis2011-01-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This usually points to the RVCT include directory, but those headers are not appropriate for Symbian. RevBy: Trust me
| | | * | | | | | | Fixed a typo in src profile.axis2011-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | * | | | | | | Fixed a build library deployment issue in sqlite.axis2011-01-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make did not understand that sqlite3.dso, which the link relies on, is the same as $$OBJECTS_DIR/sqlite3.dso, which is extracted by the profile. RevBy: Trust me
| | | * | | | | | | Fixed include in network module on Symbian.axis2011-01-281-1/+1
| | | | | | | | | |
| | | * | | | | | | Added object script support to RVCT when using MinGW qmake generator.axis2011-01-282-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * | | | | | | Added Symbian makefile building support using MinGW backend.axis2011-01-283-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * | | | | | | Fixed some tools definitions and properties in symbian profiles.axis2010-12-232-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for Symbian development on Windows using makefiles. RevBy: Trust me
| | * | | | | | | | Fix warning in sun compilerOlivier Goffart2011-01-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning, nullref: Initializing const myClass& to a NULL value. Patch inspired by the one in QTBUG-16755 Task-number: QTBUG-16755
| | * | | | | | | | Added missing header.axis2011-01-281-0/+41
| | | | | | | | | |
| | * | | | | | | | Fix GCC compiler warningShane Kearns2011-01-271-1/+1
| | | | | | | | | |
| | * | | | | | | | add qscopedvaluerollback autotest to corelib.proShane Kearns2011-01-271-0/+1
| | | | | | | | | |
| | * | | | | | | | Merge branch 'QTBUG-15292-fix' into earth-masteraxis2011-01-276-54/+109
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Added Symbian deployment localization for makefile build system.axis2011-01-275-53/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
| | | * | | | | | | | Made the translations dependency work for shadow builds.axis2011-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | * | | | | | | | | Add autotest for QScopedValueRollbackShane Kearns2011-01-262-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mread
| | * | | | | | | | | Add QScopedValueRollback tools class.Shane Kearns2011-01-263-3/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This template allows a value to be automatically rolled back to a previous state when the class goes out of scope. This can be used to maintain a valid state when an exception is thrown. Reviewed-by: mread Reviewed-by: joao
| | * | | | | | | | | network tests: make IMAP, FTP testdata more flexible.Rohan McGovern2011-01-256-51/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all hardcoded IMAP/FTP fixtures into network-settings.h. Make it work with new and old network test server. Reviewed-by: Markus Goetz Task: QTBUG-15114
| | * | | | | | | | | Merge branch 'earth/file-engine-refactor'Shane Kearns2011-01-251-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Fix for using search paths with a dirty pathShane Kearns2011-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opening "searchpath:/file" and other non clean paths was failing Reviewed-by: joao
| | * | | | | | | | | Improve documentation for PWD variable.Robin Burchell2011-01-171-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Note that it can be used in shadow build circumstances. - Note that IN_PWD is an alias for PWD. - See also: _PRO_FILE_ Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | | | | | Use packagesExist() macro to bail if a nonexistant package is requested.Robin Burchell2011-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will solve problematic cases with large projects, lots of required packages, and no configure scripts failing to build partway through. Previously, PKGCONFIG processing would error to stdout, but continue the compilation. This should not affect existing code overly much, apart from projects who added nonexistent packages they didn't use to PKGCONFIG (but let's face it, that's a bit of a stupid thing to do.) Task-number: QTBUG-11418 Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | | | | | Add packagesExist() function to qmake.Robin Burchell2011-01-174-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to detect whether or not a given (set of) packages exist, which can be useful for compiling in or our extra functionality at build time. Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | | | | | Added Symbian implementation of keyboard language functions.axis2011-01-143-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More specifically, QApplication::keyboardInputLocale() and QApplication::keyboardInputDirection(). Task: QTBUG-15600 RevBy: Sami Merila
| | * | | | | | | | | Help message clarificationThiago Marcos P. Santos2011-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2548 Signed-off-by: axis <qt-info@nokia.com>
| | * | | | | | | | | No longer copy the executable file to phone by defaultThiago Marcos P. Santos2011-01-141-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user needs to explicitly use -u or --upload to do that. Task-number: QTBUG-16625 Merge-request: 2548 Signed-off-by: axis <qt-info@nokia.com>
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-02-1618-21/+601
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (27 commits) Workaround for QTBUG-17468 fix crash when setting QPROCESS_DEBUG Add QDir/tree benchmark to "trusted" list Added file header Removing unnecessary settings from test app .pro file commented out unused function argument Fixed qfilesystemmodel autotest tst_qfileopenevent changed to run on all platforms Started move of QFileOpenEvent autotest to generic Updates after review comments review improvements for QFileOpenEvent changes added qfileopenevent test to the symbian tests removed dodgy file header renamed .pro file to make qmake happy Development of QFileOpenEvent testing for Symbian Started a QFileOpenEvent test for Symbian removed double forward declaration Fixed a trailing whitespace Using QFile open by RFile and take ownership of handle Added a file handle to QFileOpenEvent on Symbian ...
| * | | | | | | | | | Merge remote branch 'qt/master' into earth-team-stagingJoão Abecasis2011-02-16416-16999/+21055
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-02-155-46/+28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Removed timestamp setting and checking for Symbian header export Cocoa/Alien: bugfix corner cases with popups and enter/leave My 4.7.2 changes Fix QFileDialog Symbian native file dialog filename filtering. fix QMAKE_COPY_DIR for mingw+sh Phonon MMF backend enabled in configuration and deployment Using a better flag to control the fast allocator Using QElapesedTimer for Symbian idle detector Idle detector thread improvements Updated QtGui and QtCore DEF files
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-02-15740-18542/+36300
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (506 commits) Removed timestamp setting and checking for Symbian header export Cocoa/Alien: bugfix corner cases with popups and enter/leave My 4.7.2 changes Fix QFileDialog Symbian native file dialog filename filtering. fix QMAKE_COPY_DIR for mingw+sh Phonon MMF backend enabled in configuration and deployment Using a better flag to control the fast allocator Using QElapesedTimer for Symbian idle detector Idle detector thread improvements Updated QtGui and QtCore DEF files Update tests for QScriptEngineAgent. PathView items were not correctly updated when rootIndex changed. Allow text to selected in a TextEdit or TextInput inside a Flickable. Update modules-related tests and docs CLeanup registers after AddString 4.7.2 changes Change paging attributes for Symbian binaries Fix build failure Fix regression in creating mkspecs/default Use the thread-default glib context for the DBus connection in the ICD bearer manager. ...
| | * | | | | | | | | | | Removed timestamp setting and checking for Symbian header exportEckhart Koppen2011-02-151-46/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Symbian, headers get always exported, and timestamps are not needed. Reviewed-by: TrustMe
| | * | | | | | | | | | | Cocoa/Alien: bugfix corner cases with popups and enter/leaveRichard Moe Gustavsen2011-02-154-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that we sometimes hit a strange bug with enter/leave events when a popup is showing. If you righpress to show the popup, and then move the mouse outside the window, we get a continues series of leave events. This patch separates more the native vs alien logic for dispatching enter/leave to accommondate this problem
| | * | | | | | | | | | | My 4.7.2 changesKent Hansen2011-02-151-4/+24
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix QFileDialog Symbian native file dialog filename filtering.Miikka Heikkinen2011-02-151-33/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now QFileDialog static functions that use Symbian native file dialog should find the same files as non-native QFileDialog for any given filename filter. Task-number: QTBUG-17298 Reviewed-by: Janne Koskinen