summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-02-1656-439/+1428
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (52 commits) Add experimental support for armCC on Linux Fixed resizing popups with QSizeGrip on X11 Workaround public header depending on private in symbian^3 Fix reversed condition Fix warning, unused parametter error Fixed mapFromGlobal in some window managers on X11 Removed obsolete code that was incorrectly handling ConfigureNotify QMutex: do not use inline mutex in debug. Fix race condition between QEventLoop::exec and QThread::exit Remove QThreadData::mutex tst_qnetworkreply: Use proper test server hostname demo browser: Verbose output about Zerocopy usage tst_qnetworkreply: Some additions QNAM: Delete old file QNAM: Move authentication cache to separate class tst_qnetworkreply: Relax a condition Implement QThreadData::current using __thread Crash in QFileSystemEngine::canonicalName with older libc version Fix leak in QFactoryLoader Fixed "not a valid preprocessing token" on GCCE. ...
| * Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-1656-439/+1428
| |\ | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| | * Add experimental support for armCC on LinuxHarald Fernengel2011-02-115-2/+144
| | | | | | | | | | | | Reviewed by our Anttis
| | * Fixed resizing popups with QSizeGrip on X11Denis Dzyubenko2011-02-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt::Popup implicitly means Qt::X11BypassWindowManagerHint, and according to ICCCM 4.1.5 window manager should not move or resize windows that have override-redirect flag set (i.e. X11BypassWindowManagerHint). Task-number: QTBUG-11447 Reviewed-by: Olivier Goffart
| | * Workaround public header depending on private in symbian^3Shane Kearns2011-02-081-1/+6
| | | | | | | | | | | | | | | | | | | | | f32file.h (public) depends on e32svr.h (private), and in symbian^3 the private headers have been moved to a different include path. Reviewed-by: axis
| | * Fix reversed conditionOlivier Goffart2011-02-081-1/+1
| | | | | | | | | | | | Introduced in my previous fix for QTBUG-17257
| | * Fix warning, unused parametter errorOlivier Goffart2011-02-081-2/+1
| | | | | | | | | | | | | | | | | | Use the Function not implemented error Reviewed-by: Joao
| | * Fixed mapFromGlobal in some window managers on X11Denis Dzyubenko2011-02-081-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous mapFromGlobal optimization in cdd776a91e65bf5c30cea1bab9823134a3f797d0 broke behavior in some window managers like metacity when resizing by dragging the top-left corner. Most likely it is a bad behaviour of the window manager (according to ICCCM 4.1.5 we should get a ConfigureNotify event with x and y in root coordinates if you consider this is a "movement" of a window). Reviewed-by: Olivier Goffart
| | * Removed obsolete code that was incorrectly handling ConfigureNotifyDenis Dzyubenko2011-02-081-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in question was calling XSync and then processing ConfigureNotify requests, but only using the width/height information from the event, while ignoring the x,y properties. The code was consuming synthetic ConfigureNotify with x,y in root coordinate system that we are supposed to receive from the window manager, which broke mapFromGlobal/mapToGlobal behavior (after cdd776a91e65bf5c30cea1bab9823134a3f797d0) Reviewed-by: Olivier Goffart
| | * QMutex: do not use inline mutex in debug.Olivier Goffart2011-02-071-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Debugger tools (such as valgrind) hooks into QMutex::lock and QMutex::unlock. So we should continue to call this function if we want to keep those tools working Reviewed-by: brad
| | * Fix race condition between QEventLoop::exec and QThread::exitOlivier Goffart2011-02-074-2/+29
| | | | | | | | | | | | | | | | | | | | | As also mentioned in QTBUG-16692 Reviewed-by: brad Task-number: QTBUG-17257
| | * Remove QThreadData::mutexOlivier Goffart2011-02-071-2/+0
| | | | | | | | | | | | | | | | | | which does not seem to be used. Reviewed-by: Brad
| | * tst_qnetworkreply: Use proper test server hostnameMarkus Goetz2011-02-071-1/+1
| | | | | | | | | | | | Reviewed-by: Martin Petersson
| | * demo browser: Verbose output about Zerocopy usageMarkus Goetz2011-02-042-2/+8
| | |
| | * tst_qnetworkreply: Some additionsMarkus Goetz2011-02-041-1/+15
| | |
| | * QNAM: Delete old fileMarkus Goetz2011-02-041-84/+0
| | | | | | | | | | | | | | | Forgot to delete this file. Since 4.8 we use the QNetworkReplyDataImpl instead of a QNetworkAccessDataBackend
| | * 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