summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qmakeExtraCompilerFixes' using "ours" strategyaxis2009-12-180-0/+0
|\ | | | | | | | | | | | | Note that I merged using the "ours" strategy, because the patch from that branch is no longer needed for building for Symbian. However, it is a big patch, which could potentially be used later, therefore I preserved it in history this way.
| * Made OBJECTS variable work with QMAKE_EXTRA_COMPILERS input variable.axis2009-10-232-90/+113
| | | | | | | | | | | | | | This required two fixes. First, make sure that all compilers needing OBJECTS come after all compilers producing SOURCES. Second, delay population of the variable_out variables that depend on OBJECTS until that variable has been initialized.
* | Disabled OpenGL on Symbian.axis2009-12-111-0/+7
| |
* | Disabled Qt3Support on Symbian.axis2009-12-111-2/+2
| |
* | Fixed Symbian resource creation.axis2009-12-111-0/+2
| |
* | Fixed a lot of small bugs in the version and UID handling.axis2009-12-111-7/+34
| | | | | | | | | | | | This patch introduces a dependency on a Unix shell to parse the values. This naturally has to go away if we port to Windows later, but it's good enough for now.
* | Added some libraries.axis2009-12-111-1/+3
| | | | | | | | | | | | | | | | These should be moved later on. Conflicts: mkspecs/symbian/linux-armcc/qmake.conf
* | Increased section base address to avoid overlap at link time.axis2009-12-111-1/+1
| |
* | Fixed a scoping bug GUI.axis2009-12-111-1/+1
| |
* | Added support for QT_*_STATICLIB variables in qmake.axis2009-12-113-9/+16
| | | | | | | | This is so that Symbian can have custom prefixes and extensions.
* | Added the Qt tree to search paths.axis2009-12-112-0/+6
| | | | | | | | | | | | Conflicts: mkspecs/symbian/linux-armcc/qmake.conf
* | Fixed some bugs in the exe generation on Symbian.axis2009-12-111-2/+2
| |
* | Fixed a bug in the LIBS mangling on Symbian.axis2009-12-111-2/+9
| | | | | | | | | | Previously, if one entry appeared more than once it would receive several extensions.
* | Switched to using ABIv2 format to generate Symbian binaries.axis2009-12-117-190/+37
| | | | | | | | | | This means using elf2e32 instead of elftran, and eliminates the need for generating exports manually.
* | Merge branch 'possible_qmake_scope_fixes'axis2009-12-111-1/+1
|\ \
| * | Fixed qmake scope specification.axis2009-10-231-1/+1
| |/ | | | | | | Even if we compile on Linux, that doesn't mean we run it there.
* | Merge branch 'qmakeShlibFixes'axis2009-12-114-19/+56
|\ \
| * | Switched Symbian away from the Linux lib$(TARGET).4.6.0 naming schemeaxis2009-10-231-3/+21
| | |
| * | Made Symbian use QMAKE_SYMBIAN_SHLIB and QMAKE_PREFIX_SHLIB variablesaxis2009-10-231-0/+5
| | |
| * | Added QMAKE_PREFIX_SHLIB and QMAKE_SYMBIAN_SHLIB support.axis2009-10-232-16/+30
| |/ | | | | | | | | | | | | | | | | The first enables you to use a prefix in front of the library. It is by default enabled for all platforms which previously used "lib", and on Symbian it is set to the empty string. The second variable enables Symbian style linking, where you link to a stub .lib file, but the actual runtime library is .dll.
* | Disable the forced profile recursion on Qt's Symbian build system.axis2009-12-111-2/+3
| | | | | | | | This makes configure a lot faster.
* | Added support for -s60 option to configure.axis2009-12-111-1/+27
| | | | | | | | | | This was required in order to enable the pieces of code inside QT_WS_S60.
* | Switched to Symbian export rules when building.axis2009-12-111-0/+4
| | | | | | | | | | This was done by enabling the QT_DLL flag when configuring for Symbian.
* | Revert "Modify visibility test to support armcc as well."axis2009-12-112-17/+8
| | | | | | | | This reverts commit 1ca27669332b5e19284297b0bbc57700f59fed33.
* | Removed useless dependency.axis2009-11-131-1/+1
| |
* | Added UIDs to the resource generation to avoid warning.axis2009-11-131-1/+2
| |
* | Added Symbian resources for QtGui.axis2009-11-131-0/+2
| |
* | Fixed compilation on S60 without keypad navigation.axis2009-11-131-0/+2
| |
* | Some compile fixes.axis2009-11-132-2/+2
| |
* | Added automatic mangling of LIBS to include vtable exports.axis2009-11-133-2/+20
| |
* | Added a missing POSIX macro to the Symbian qplatformdefs.h.axis2009-11-061-0/+1
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-061343-45025/+62926
|\ \
| * \ Merge branch '4.6-s60' into 4.6axis2009-11-0656-384/+1599
| |\ \
| | * | Initial LFLAGS support for qmake on Symbian OSIain2009-11-052-12/+53
| | | | | | | | | | | | | | | | Reviewed-by: Shane Kearns
| | * | QS60Style: Harmonize theme graphic with LineEdit and QTextEditSami Merilä2009-11-053-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In S60 the single line and multi line editors have same theme background. We should share one as well. Now we are using fancy notepad graphic with QTextEdit, but it makes QTextEdits to look apart from QLineEdits and in some themes it is styled rather badly (as it is not a central graphic item in a theme). Therefore it is better to use one and same graphic for both widgets. Task-number: QTBUG-5259 Reviewed-by: Alessandro Portale
| | * | QProgressBar is drawn stretched in QS60StyleSami Merilä2009-11-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style draws the ends of scrollbar as too wide, causing the themegraphic to stratch which looks horrible. Task-number: QTBUG-5445 Reviewed-by: Alessandro Portale
| | * | QS60Style: Checked menu check indicators are not shownSami Merilä2009-11-051-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style does not draw checked menu indicators at all. This is due to that it initializes used style option with style option's base class. Therefore relevant data for menu item indicator is not copied. Task-number: QTBUG-4717 Reviewed-by: Alessandro Portale
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0592-353/+1193
| | |\ \
| | * | | Fixed symbian-abld build problems with xmlpatternsxqtsMiikka Heikkinen2009-11-052-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qmake generators for symbian can't handle .depends for SUBDIRS values, instead relying on the order of subdirs. Reordered the subdirs as a hot fix to get test case to build before qmake can be properly fixed. Also removed duplicate inclusion of xmlpatterns.pri, which was causing compile time warnings due to duplicate MACRO statements in mmps. Reviewed-by: Janne Koskinen
| | * | | tst_qwidget widgetAt now does not leave widget lowered if test failsGareth Stockwell2009-11-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5396 Reviewed-by: axis
| | * | | Fix for link error when building QtSvgGareth Stockwell2009-11-042-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building QtSvg for Symbian (ARMV5 build) fails due to the following linker error: QGraphicsEffectSourcePrivate::invalidateCache(bool) const (referred from qsvgwidget.o). This function is called from the inline destructor of QGraphicsEffectSourcePrivate. Making this destructor non-inline fixes the problem. It is not clear why QtSvg is instantiating this destructor, however, as neither QGraphicsEffectSourcePrivate nor any of its derived classes are referred to from QtSvg source. This problem seems to have been triggered by 85e41590. Reviewed-by: Shane Kearns
| | * | | QS60Style: QToolButton indicator will not fit into toolbutton areaSami Merilä2009-11-041-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QToolButton rect does not include reserved area for menu indicator, so drawing the indicator makes the rest of the toolbutton area smaller. Fixed by including the menu indicator area into tool button. Task-number: QTBUG-5266 Reviewed-by: Alessandro Portale
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-044-111/+149
| | |\ \ \
| | | * | | Unexported a class that doesn't need to be exported.axis2009-11-043-108/+108
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Iain
| | | * | | Fixed input panel detection on post-5.0 S60 SDKs.axis2009-11-042-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QT-2418 RevBy: Shane Kearns
| | * | | | Make button margins bigger in QS60StyleSami Merilä2009-11-041-0/+7
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currenly QS60Style relies on QCommonStyle to calculate correct button content size. Unfortunately, common style does not understand frames, so it is possible that the frame-border of theme graphic gets under button content. This change makes both QPushButton and QToolButton bigger. Task-number: None Reviewed-by: Alessandro Portale
| | * | | Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-04747-8997/+20543
| | |\ \ \
| | | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-04704-8768/+19538
| | | |\ \ \
| | | * | | | Fixed modal dialog fading support in Symbian.Janne Anttila2009-11-043-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switched to use S60 API instead of Symbian one, the rationale is given below as an copy/paste from S60 docs: "Cross-application fading support Symbian OS provides some support for fading, but this only covers fading within an application. The S60 UI can have more than one application on the screen at once (in fact, since the system parts of the Status pane are inside EikServer, it always has more than one application on the screen). The S60 UI introduced the fading and drawing system to manage the fading state for the whole system. Application and UI control code for S60 should not attempt to set fade for a popup window directly. Instead, the popup window should implement the MAknFadedComponent interface, and should use the TAknPopupFader support class to set the fade. The application UI base classes interact with the fading and drawing system by informing it when the foreground status of the application changes. They also use it to implement system wide fading." There is also task QTBUG-5393 to implement fading support in future without S60 dependency. Task-number: QTBUG-5181 Reviewed-by: Sami Merila
| | | * | | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-049-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added symbianpkgrules.pri include to some examples Reviewed-by: Janne Koskinen