summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Add enablers for Symbian App BoosterSimon Frost2011-05-032-0/+33
| | | | | | | | | | | | To use the Symbian App Booster, a registration file (matching the filename of the executable, eg helloworld.applite) must be copied to the import folder within QtAppBooster's private directory. The appropriate library (qdeclarativebooster) must also be linked against. With this change, the required actions are carried out by adding "CONFIG += symbian_appbooster" to the application's .pro file. Task-number: QT-4892 Reviewed-by: Miikka Heikkinen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-181-22/+27
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add new QSysInfo::symbianVersion() enums
| * Add new QSysInfo::symbianVersion() enumsMiikka Heikkinen2011-04-181-22/+27
| | | | | | | | | | | | | | | | Add new enums for future Symbian platforms and fix the docs of existing ones. Task-number: QT-4593 Reviewed-by: Sami Merila
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Build fix for transition effect support on S60 5.0. Make EGL surface transparency working on Symbian. Splitview flag should also be updated to inputcontext QGraphicsView with vertical scrollbar flickers when splitview opens Splitview: opening a context menu should not re-position of focusItem Trigger fullscreen transition effects properly on app exit. Do not use SetSurfaceTransparency() on raster.
| * Trigger fullscreen transition effects properly on app exit.Laszlo Agocs2011-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Avkon calls BeginFullScreen() and EndFullScreen() to trigger the fullscreen system transition effects for application exit, however the calls are made too late for Qt apps because the widgets are already destroyed. Instead, the effects are triggered explicitly from Qt, before closing the widgets, or from aboutToQuit, whichever comes first. Task-number: QT-4718 Reviewed-by: Jani Hautakangas
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-135-8/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits) Have the backing store destroyed also in special Symbian scenarios. Use FixNativeOrientation on Symbian when the application wants it. QS60Style: itemview item with checkbox and text is drawn incorrectly Revert "Have the backing store destroyed also in special Symbian scenarios." Add focus frame support in style sheet Two QListView autotests do not pass on Symbian^3 releases tst_QStyle::drawItemPixmap test case fails on Symbian^3 Add the auto detection for OpenVG in configure Add focus frame support in stylesheet Make QS60Style to support new Tab graphics in new Symbian releases GraphicsView is not reset if focusItem is not set when keyboard closes Check the validity of qt_desktopWidget before dereferencing Labels are not visible in dialogs with all themes (part2) Labels are not visible in dialogs with all themes Enable webkit for symbian-gcce in configure Enable webkit build for the makefile build system with gcce Add the rules for gcce in do_not_build_as_thumb.prf Correct some parameters for the makefile build sytem, armcc and gcce Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system Do not unnecessarily draw application twice in landscape ...
| * Add the rules for gcce in do_not_build_as_thumb.prfLiang Qi2011-04-071-0/+5
| | | | | | | | Reviewed-by: axis
| * Correct some parameters for the makefile build sytem, armcc and gcceLiang Qi2011-04-072-7/+6
| | | | | | | | Reviewed-by: axis
| * Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build systemLiang Qi2011-04-072-1/+4
| | | | | | | | Reviewed-by: axis
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-1213-22/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: look for makespec in the build dir first make collection of SUBDIRS in solution generator less bizarre run depend_command in build dir in VS generators as well fixify target source against build tree fix fixifying of QMAKE_SUBSTITUTES dist target: fixify OBJECTS_DIR against output dir fix paths of vpath-resolved files simplify: absolute fixification ignores the base dir arguments simplify: fileFixify for all same paths is always "." simplify: the input and output dirs are already normalized stop fixifying after first success create a pwd string with a trailing slash only on demand make uic3-generated moc files depend on mocinclude.tmp useful location reporting for errors from QMAKE_SUBSTITUTES clean up visual studio identification code prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed" fix detection of relative location information
| * | make uic3-generated moc files depend on mocinclude.tmpOswald Buddenhagen2011-04-121-0/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-16951 Reviewed-by: mariusSO
| * | clean up visual studio identification codeOswald Buddenhagen2011-04-1212-22/+16
| | | | | | | | | | | | | | | | | | | | | TEMPLATE is (now) reliably prefixed with "vc" when a vs generator is used. Reviewed-by: mariusSO
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-061-0/+8
|\ \ \ | |/ / |/| | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Improve Flickable dynamics and allow platform specific tweaking.
| * | Improve Flickable dynamics and allow platform specific tweaking.Martin Jones2011-04-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flickable's previous overshoot behavior was to continue past the boundary without any additional friction (deceleration). It now decelerates faster when overshooting. On touch screens in particular, the last points when a touch point is released are unreliable, resulting in sporadic flick velocities. It also now allows the number of samples used for velocity calclations to be tuned. It is now easy to tune the Flickable behavior for different platforms. Change-Id: I24142a50be1fde2f8877e359e30b8efcdd1f7d5c Task-number: QTBUG-10894, QTBUG-16388, QTBUG-17830 Reviewed-by: Michael Brasser
* | | win32-g++: Correct the order of linked Windows librariesMark Brand2011-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Commit a6d48ca corrected the problem for win32-g++. Here we do the same for win32-g++-cross. Merge-request: 1173 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: win32-g++: Correct the order of linked Windows libraries Fixing a traling space on if statement that fails in Solaris.
| * | | win32-g++: Correct the order of linked Windows librariesJonathan Liu2011-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows 7, kernel32.dll exports many of the same functions as advapi32.dll. If executables link to these functions in kernel32.dll instead of advapi32.dll, running these executables on older versions of Windows will cause an entry point error. This would occur due to kernel32 being specified before advapi32. To resolve this issue, advapi32 is specified before kernel32 when linking. Task-number: QTBUG-18537 Merge-request: 1169 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-041-2/+5
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QGradient stop with NaN position on Symbian. Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed QApplication does not define flag for "single touch" Native dialog softkeys are covered by QApplication softkeys
| * | Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not neededMiikka Heikkinen2011-04-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | If the path to translation file is already absolute, do not add the $$_PRO_FILE_PWD_ to it in symbian.conf Task-number: QT-4842 Reviewed-by: axis
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-011-0/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add the auto detection for OpenGL in configure for makefile build system on Symbian. Don't display softkeys/statusbar on FS childs of non-FS windows
| * | Add the auto detection for OpenGL in configure for makefile build system on ↵Liang Qi2011-04-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Symbian. Task-number: QTBUG-18485 Reviewed-by: Miikka Heikkinen Reviewed-by: axis
* | | Remove useless LFLAGSDarryl L. Miles2011-03-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These options were found to be no longer required for MinGW releases at this time (they are also never valid for MinGW64 when building 64bit). They actually never worked anyway, as the GNU toolchain linker option "-enable-stdcall-fixup" actually means "-e" "nable-stdcall-fixup". Merge-request: 1158 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-312-27/+18
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-281-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update changes for 4.7.3 directfb: avoid version dependency by setting DSPD_DST blend functions manually fix -enable-stdcall-fixup usage Report that an update is needed if no update was done
| * | | QSysInfo support for next generation Symbian devices.Miikka Heikkinen2011-03-242-27/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new QSysInfo::S60Version enum value SV_S60_5_3 is introduced. QSysInfo::symbianVersion still returns SV_SF_3 for the new platform. The official name of the platform is still pending, so documentation will be updated later. Task-number: QT-4593 Reviewed-by: Sami Merila
* | | | use mkdir -p for mingw+shOswald Buddenhagen2011-03-311-1/+1
| |/ / |/| | | | | | | | all other unix mkspecs do so
* | | fix -enable-stdcall-fixup usageMark Brand2011-03-281-2/+2
|/ / | | | | | | | | | | | | | | | | | | the leading "-Wl," was apparently accidentally split off to the wrong line. Originally done in 0953ee3 for mkspecs/win32-g++. Merge-request: 1154 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Add /q switch to QMAKE_DEL_FILE command in symbianMiikka Heikkinen2011-03-181-1/+1
| | | | | | | | | | | | | | | | Builds will otherwise halt without giving reason if a wildcard is given in QMAKE_CLEAN in symbian-abld. Task-number: QTBUG-18207 Reviewed-by: axis
* | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-1418-162/+291
|\ \ | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * | Removed reference to nonexistant profile.axis2011-03-041-1/+0
| | | | | | | | | | | | | | | | | | | | | Probably this was a result of backporting symbian-gcce support from 4.8 to 4.7. RevBy: Liang Qi
| * | Corrected a mismerge in GCCE link parameters.axis2011-03-041-1/+1
| | | | | | | | | | | | RevBy: Trust me
| * | Fixed incorrect referral to an include file.axis2011-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | Better to make it relative to the profile. That way it is always found, regardless of where Qt is located. RevBy: Liang Qi
| * | Fixed GCCE libdir handling if the paths have spaces in them.axis2011-03-041-9/+9
| | | | | | | | | | | | RevBy: Trust me
| * | Added MinGW support for adding lib prefix and extension via profile.axis2011-03-041-0/+2
| | | | | | | | | | | | RevBy: Oswald Buddenhagen
| * | Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.axis2011-03-041-6/+6
| | | | | | | | | | | | | | | | | | | | | This usually points to the RVCT include directory, but those headers are not appropriate for Symbian. RevBy: Trust me
| * | Added object script support to RVCT when using MinGW qmake generator.axis2011-03-041-0/+2
| | | | | | | | | | | | RevBy: Oswald Buddenhagen
| * | Added Symbian makefile building support using MinGW backend.axis2011-03-041-1/+5
| | | | | | | | | | | | RevBy: Oswald Buddenhagen
| * | Fixed some tools definitions and properties in symbian profiles.axis2011-03-042-2/+3
| | | | | | | | | | | | | | | | | | This is needed for Symbian development on Windows using makefiles. RevBy: Trust me
| * | Added missing header.axis2011-03-041-0/+41
| | |
| * | Unified the usage of $${EPOCROOT} for symbian.axis2011-03-042-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen Conflicts: mkspecs/symbian-gcce/qmake.conf
| * | Added Symbian deployment localization for makefile build system.axis2011-03-044-51/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03-041-1/+1
| | | | | | | | | | | | RevBy: Miikka Heikkinen
| * | Fixed PREPEND_INCLUDEPATH being executed too early.axis2011-03-043-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to be carried out inside qt.prf, but was moved to default_post.prf. However, since qt.prf is executed after default_post.prf, it would still prepend its own include paths at the very front, which is wrong. Fixed by introducing a new feature profile for PREPEND_INCLUDEPATH, which is run after qt.prf (features in $$CONFIG are executed in reverse order). RevBy: Miikka Heikkinen
| * | Moved the default dependency targets to default_post.prf.axis2011-03-042-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file that they were in would not be parsed if CONFIG -= qt, but it always needs to be parsed, otherwise apps that don't use Qt will fail the sis file creation. RevBy: Miikka Heikkinen Conflicts: mkspecs/features/symbian/default_post.prf
| * | Fix some build issues for building Qt for Symbian on Mac OS X.axis2011-02-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to add edllstub.lib and change a bit because some refactored work for mkspecs in 86636e0c4ab91bfb60be1e18d6daff34d41a5927. RevBy: axis Conflicts: mkspecs/symbian-gcce/qmake.conf
| * | Got rid of some "duplicate library" warnings.axis2011-02-211-1/+1
| | | | | | | | | | | | RevBy: Trust me
| * | Changed various qmake constructs to support Windows.axis2011-02-182-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Thomas Zander Conflicts: mkspecs/features/symbian/symbian_building.prf
| * | Fixed various quotation problems when porting to Windows.axis2011-02-182-8/+13
| | | | | | | | | | | | | | | | | | These should work for both Windows and UNIX platforms. RevBy: Thomas Zander
| * | Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-188-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander Conflicts: src/s60main/s60main.pro
* | | Implement language fallback logic for localize_deploymentMiikka Heikkinen2011-03-092-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When querying system locale it does return both language and country, so sometimes users want to have both in their .ts file names (e.g. myapp_zh_CN.ts). This is bit problematic in Symbian, where there are separate language codes for only very few language + country combinations. Until now, the unsupported combinations were simply dropped from deployment localization. More proper way to handle these unknown language + country combinations is to fall back to using the plain language code for them instead of dropping them altogether. This is somewhat analogous to how QTranslator::load() loads .ts files if it can't find the file for specified language + country combination. E.g. User defines: TRANSLATIONS += myapp_zh_CN.ts myapp_zh_HK.ts myapp_zh_TW.ts There are separate Symbian language codes for HongKong Chinese (zh_HK = 30) and Taiwanese Chinese (zh_TW = 29), but rest of the world is expected to use just Chinese (zh = 31). This means "zh_CN" mapping is not provided as it would be same as plain "zh". With this fix, qmake will now automatically generate a fallback mapping from "zh_CN" to "31" for deployment localization purposes, and is able to read application captions and pkg names from myapp_zh_CN.ts. If there are multiple TRANSLATIONS defined that would result in same Symbian language code, only the first one is used. Task-number: QTBUG-17927 Reviewed-by: Oswald Buddenhagen
generated by cgit v0.12 at 2024-12-11 10:12:24 (GMT)