summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Make QtUiTools use the lib-infix passed to configure.Friedemann Kleint2012-01-311-3/+3
| | | | | | | Patch contributed by OpenEmbedded project. Reviewed-by: hjk Task-number: QTBUG-7169
* There is no predefined qmake x11 scope for x11 builds.Robert Griebl2012-01-311-0/+3
| | | | | | | | | | | | All the autotests that are using a x11{} scope to add QMAKE_LIBS_X11 to LIBS are actually not adding anything at all, but just happen to build correctly because the standard GNU ld resolves symbols in shared libraries recursively (and libQtGui depends on all those X libs already). Building those tests with GNU gold will lead to undefined X* symbols, since gold doesn't use implicitly dependant libs to resolve symbols. Reviewed-by: Harald Fernengel
* tests: allow unstable tests to be marked with CONFIG+=insignificant_testRohan McGovern2011-11-151-0/+4
| | | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Reviewed-by: Jason McDonald Change-Id: I50a712c33c2ebb0af39f1ea0bf2adef7f0936425 (cherry picked from commit b0a5a988900b777cb08012408eb108512a3e873b)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-051-1/+5
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix compile errors on S60 3.2 Fix to QGLWidget rendering with VG graphics system
| * Fix compile errors on S60 3.2Shane Kearns2011-08-051-1/+5
| | | | | | | | | | Task-number: QTBUG-20743 Reviewed-by: Liang Qi
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-041-1/+1
|\ \ | |/ | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian/gcce: Remove the useless -T flag
| * Symbian/gcce: Remove the useless -T flagMartin Storsjo2011-08-041-1/+1
| | | | | | | | | | | | | | | | | | The -T flag is a linker flag, not a compiler flag, and does nothing. If specified as a linker flag, this even yields errors (since there is no linker script file named 'script'). Merge-request: 1302 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-022-0/+7
|\ \ | |/ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support debuggable in the makefile build system Mark all Symbian debug binaries debuggable by default
| * Support debuggable in the makefile build systemLiang Qi2011-08-021-0/+5
| | | | | | | | | | | | Task-number: QTBUG-20697 Reviewed-by: Shane Kearns Reviewed-by: Miikka Heikkinen
| * Mark all Symbian debug binaries debuggable by defaultMiikka Heikkinen2011-08-021-0/+2
| | | | | | | | | | | | | | | | | | | | CODA 4.1.* cannot be used to debug binaries that do not have DEBUGGABLE_UDEBONLY keyword specified, so add this keyword to all projects by default. Adding this keyword has no impact for previous versions of CODA or TRK. Task-number: QTBUG-20669 Reviewed-by: Shane Kearns
* | sync win32-g++-cross with win32-g++ (lib prefix and extension)Mark Brand2011-07-081-0/+2
|/ | | | | | | | | | qmake now needs library prefix and extension to be supplied. This was added to plain win32-g++ in dbbf06e. Now added to win32-g++-cross. Without this, static libraries get named 'X.lib' instead of 'libX.a'. Merge-request: 1283 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engineJani Hautakangas2011-06-301-0/+3
| | | | | | | | Initial implementation of QPixmap::fromSymbianRSgImage(RSgImage*) on OpenGL graphics system. Task-number: QTBUG-15254 Reviewed-by: Laszlo Agocs
* Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-251-2/+2
| | | | | | | | The patch applies everything from the original, except for the filename case changes in LIBS which are handled differently based on the auto-detected is_using_gnupoc CONFIG value. Reviewed-by: Laszlo Agocs
* Update the detection of is_using_gnupoc for S3.Liang Qi2011-05-251-1/+1
| | | | | | The akndoc.h was moved to epoc32/include/mw. Reviewed-By: axis
* Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-251-2/+2
| | | | | | | | | | Changing the library names to lowercase breaks 5.0-based Linux builds. It will be investigated if it is possible to change the SDKs instead. If not, the patch will have to be extended to use the original names for 5.0 and the lowercased ones otherwise. This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-181-2/+2
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing Linux compatibility issues for Symbian
| * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-181-2/+2
| | | | | | | | Reviewed-by: Laszlo Agocs
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-17135-2361/+2360
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| * remove -fno-stack-protectorOswald Buddenhagen2011-05-131-2/+1
| | | | | | | | | | | | there is no need to disable stack protector unless one uses an ancient version of gcc. taken from kubuntu.
| * Update licenseheader text in source filesJyri Tahtela2011-05-13134-2359/+2359
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | 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
generated by cgit v0.12 at 2024-09-05 20:24:53 (GMT)