summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation of apps outside of QtThomas Zander2010-01-191-1/+5
| | | | | | Symbian SDK has all headers twice in two dirs, which have to be in the include path in the right order for stuff to compile. Make sure we have the proper dir first.
* Updates on how its easier nowThomas Zander2010-01-191-13/+7
|
* Fix symbian building to always have a pre-determined uid3Thomas Zander2010-01-193-1/+5
| | | | | For all Qt libs we use hardcoded uid3s, so these plugins should have them too.
* Fix building of pluginsThomas Zander2010-01-191-9/+10
|
* Fix the symbian version number generationThomas Zander2010-01-191-24/+21
|
* Better fix for build!=src Makefile generationThomas Zander2010-01-191-5/+3
| | | | | | | Make sure we always use the absolute path to the pro file so it will just work from either source or build dir. This fixes the usecase where qmake generated a relative path starting with '..'
* Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-191-8/+8
| | | | | The code generated would always create the Makefile in the sourcedir, even if you had src!=build
* Updated comments in the templates.axis2010-01-191-1/+2
|
* Added some stub rsc files as templates.axis2010-01-193-1/+2
| | | | | All apps will show up as wiggly at the moment, but it's just to get things running.
* Fixed makefile generation for Symbian.axis2010-01-143-5/+6
| | | | | | | | This enables fast makefiles as well as intermodule dependencies. This hasn't been tested with the other Symbian build systems. It's quite possible that they will break because of this, but we will handle that at a later time.
* Modified pkg template to be a bit more realistic.axis2010-01-141-1/+3
|
* Updates in docsThomas Zander2010-01-141-3/+6
| | | | Signed-off-by: axis <qt-info@nokia.com>
* Removed some build instructions that were no longer needed.axis2010-01-141-19/+8
|
* Merge branch 'buildInstructions'axis2010-01-144-0/+111
|\
| * Corrected instructions after dependence on armlib was introduced.axis2009-12-111-1/+2
| |
| * Updated documentation to include Wine and Open C setup.axis2009-11-131-2/+7
| |
| * Updated the documentation about epoc32 paths.axis2009-10-281-13/+19
| |
| * Made some basic build instructions for Symbian on Linux.axis2009-10-274-0/+99
| |
* | Merge branch 'cleaningUpProfiles'axis2010-01-1216-363/+367
|\ \
| * | Fixed Symbian detection in profile.axis2010-01-121-1/+1
| | |
| * | Corrected incorrect case.axis2010-01-121-1/+1
| | |
| * | Reorganized the Symbian build system profiles.axis2010-01-1213-360/+364
| | | | | | | | | | | | | | | | | | Now we try share as much as possible between the different Symbian build systems, so that changes made to the MMP systems will also work in the makefile based one.
| * | Made sure that Symbian picks up STL.axis2010-01-121-1/+1
| | |
* | | configure/S60: Make work on Linux 64bit.Friedemann Kleint2010-01-111-2/+3
|/ / | | | | | | Acked-by: axis
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-181576-40061/+70513
|\ \ | | | | | | | | | | | | | | | Conflicts: configure src/gui/text/qfontdatabase_s60.cpp
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-172-4/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: WeatherInfo now shows Oslo info upon launch instead of blank screen Fixed QCoeFepInputContext::widgetDestroyed
| | * | WeatherInfo now shows Oslo info upon launch instead of blank screenMiikka Heikkinen2009-12-171-2/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6367 Reviewed-by: Janne Anttila
| | * | Fixed QCoeFepInputContext::widgetDestroyedMiikka Heikkinen2009-12-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling SetFocus twice here was obsolete and caused intermittent panics. Replaced them with proper queueInputCapabilitiesChanged call. Task-number: QTBUG-6519 Reviewed-by: axis
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-172-12/+62
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added discussion on connecting signals that have default arg values. Stack overflow when closing a Color panel in Cocoa.
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-1731-346/+253
| | |\ \ \
| | | * | | Stack overflow when closing a Color panel in Cocoa.Prasanth Ullattil2009-12-171-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QCocoaColorPanelDelegate was going into an infinite recrusion in this particular case. The patch guards the delegate from calling accept() or reject() more than once. Task-number: QTBUG-6636 Reviewed-by: Richard Moe Gustavsen
| | * | | | doc: Added discussion on connecting signals that have default arg values.Martin Smith2009-12-171-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-3913
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-171-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed parsing of svg paths.
| | * | | | | Fixed parsing of svg paths.Kim Motoyoshi Kalland2009-12-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 928ee705 introduced a bug which affected paths with relative offsets. Task-number: QTBUG-6867 Reviewed-by: Trond
| * | | | | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-1743-200/+407
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | Avoid timer starvation when handling many X11 eventsBradley T. Hughes2009-12-173-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit d0d0fdb8e46351b4ab8492de31e5363ef6662b57, timers are normally run at idle priority. This makes it possible for the X11 handler to starve timers indefinitely. Fix this by enforcing one normal priority pass of the timer source after we have processed all X11 events. This has the added benefit of keeping animation timers smooth and consistent, which is the intention of this change. Reviewed-by: Jens Bache-Wiig
| | * | | | Disable benchlibwalltime test.Rohan McGovern2009-12-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is inherently dependent on the timing behavior of the test machine. For now, it seems too difficult to ensure this works everywhere.
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-1616-196/+52
| | |\ \ \ \
| | | * | | | Fixed wheel event delivery in graphicsview.Denis Dzyubenko2009-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to flip the y-coordinate of window- and view-local coordinates because they are flipped already. Reviewed-by: Prasanth
| | | * | | | An optimisation to QTextStreamDenis Dzyubenko2009-12-161-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using QLocale::operator== is faster than comparing languages, because when getting a language from a default constructed QLocale object, it initializes the system locale and quieries the system which languge it supports. Reviewed-by: Olivier Goffart
| | | * | | | Doc fix: mark QFileOpenEvent::url to be available since 4.6Denis Dzyubenko2009-12-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | | Do not call macToQtFormat twice in QLocale.Denis Dzyubenko2009-12-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already convert date/time format inside the getMacDateFormat, so no reason to do it again later. Reviewed-by: Prasanth
| | | * | | | Text cursor is not shown properly in line edits on Mac OS X.Prasanth Ullattil2009-12-163-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mac stlye disables the blinking cursor when there is a selection in the line edit. The cursor is not shown back when this selection is removed (either by mouse or key press events). This patch watches the selection changed signal from the line control and updates the cursor status accordingly. Task-number: QTBUG-6378 Reviewed-by: Olivier Goffart
| | | * | | | Fixes: Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj filesAndy Shaw2009-12-162-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Marius SO Details: It worked fine for Makefiles since no checking is done of the flags. Now its fixed so it works for vcproj files too making it easier for people to build 64bit targets in Visual Studio.
| | | * | | | Revert "Changes to support locale change event for symbian platform"Denis Dzyubenko2009-12-168-181/+17
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert a change that is not yet complete and was pushed by mistake. This reverts commit 44f7c1e097582a704a06ccbbf516536b88ddcd3a.
| | * | | | Doc: Modified the coding style of the Audio Devices example.David Boddie2009-12-154-69/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit will be a duplicate of the same change applied elsewhere. Reviewed-by: Kurt Korbatits
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-1527-59/+373
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-155-1/+47
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/macx-g++40/qplatformdefs.h
| | | | * | | Add a mkspec for selecting gcc-4.0 on Mac OS X.Morten Sorvig2009-12-114-0/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has one known use case: compiling with the 10.4u SDKi on 10.6. (cherry picked from commit 855f1705ceb15c303b55fcced8b0303d90352a44)
| | | | * | | Fix crash in QFontDialog::getFont() on Mac 10.4Morten Johan Sørvig2009-12-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NSFontManager setTarget] is not available on 10.4. Rev-by: Richard Moe Gustavsen