summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | make the test a bit stricterRitt Konstantin2011-01-211-0/+2
| | | | | | | | | | | | | | | | | | | | | don't say we passed the test if we didn't Merge-request: 1018 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | ignore the warning from auto-detach in destructorRitt Konstantin2011-01-211-1/+2
| | | | | | | | | | | | | | | | | | | | | we locked shm few line ago and didn't unlock it, so we expecting for this warning Merge-request: 1018 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | get rid of extra calls to handle()Ritt Konstantin2011-01-211-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | in create(), handle() is called a few lines early; in attach(), QSharedMemory::attach() calls handle() as a preparation step; in detach(), well, if we're here, unix_key is valid anyways... Merge-request: 1018 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | simplify QSharedMemory::detach()Ritt Konstantin2011-01-213-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | de-init members in the QSharedMemoryPrivate::detach() like in code for symbian. this gains a lightly better control in case of errors on detach() Merge-request: 1018 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | avoid extra calculationsRitt Konstantin2011-01-212-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | QSystemSemaphore::setKey() sets the fileName member to makeKeyFileName()'s result; no need to call it again Merge-request: 1018 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | fix error reporting on detach()Ritt Konstantin2011-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | before, we returned too early :) Merge-request: 1018 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | fix error reportingRitt Konstantin2011-01-211-0/+1
| | | | | | | | | | | | | | | | | | | | | that was mistakenly broken by 570e7b38487455d394b5b74a59edc639f3dc416f Merge-request: 1018 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.Miikka Heikkinen2011-01-212-3/+3
| | | | | | | | | | | | Reviewed-by: axis
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-211-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix to pen state handling in OpenVG paint engine.
| * | Fix to pen state handling in OpenVG paint engine.Jani Hautakangas2011-01-211-1/+1
|/ / | | | | | | | | | | | | | | | | Shape should not be filled using pen if pen brush type is NoBrush. OpenVG paint engine didn't check NoBrush case when applying pen. Task-number: QTBUG-15870 Reviewed-by: Gunnar
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-217-10/+31
|\ \ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: BorderImage fails for .sci source containing a URL positionViewAtIndex can fail when positioned near end of list.
| * | BorderImage fails for .sci source containing a URLMartin Jones2011-01-213-5/+13
| | | | | | | | | | | | | | | Task-number: QTBUG-16769 Reviewed-by: Bea Lam
| * | positionViewAtIndex can fail when positioned near end of list.Martin Jones2011-01-214-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | We positioned the view beyond the bounds, which in some cases resulted in only one item being created. Combined with a bug in the bounds fixup very many items were created. Task-number: QT-4441 Reviewed-by: Michael Brasser
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-213-89/+67
|\ \ \ | |/ / | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Revert "Fix loaded() signal to be emitted only once"
| * | Revert "Fix loaded() signal to be emitted only once"Bea Lam2011-01-213-89/+67
|/ / | | | | | | | | | | | | | | | | This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768. QTBUG-16796 reports that this commit is causing regressions relating to initial sizing of items. Task-number: QTBUG-16796
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-203-11/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "don't include harfbuzz where we don't use it" don't accidentaly enable egl when disabling openvg be more consistent about CFG_EGL_GLES_INCLUDES interpretation fix build with -opengl es1 in some cases don't include harfbuzz where we don't use it don't assign MANIFEST_DIR if we don't need it
| * | Revert "don't include harfbuzz where we don't use it"Oswald Buddenhagen2011-01-205-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | harfbuzz is indirectly included via qharfbuzz_p.h, which is included by qtextengine_p.h, which in turn is included by qfontengine_p.h and qpaintbuffer_p.h. This reverts commit 6551a2933126cc86ac4c1e5265e967100d240fb0.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-208-20/+13
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: don't accidentaly enable egl when disabling openvg be more consistent about CFG_EGL_GLES_INCLUDES interpretation fix build with -opengl es1 in some cases don't include harfbuzz where we don't use it don't assign MANIFEST_DIR if we don't need it
| * | don't accidentaly enable egl when disabling openvgRitt Konstantin2011-01-201-1/+3
| | | | | | | | | | | | | | | | | | Merge-request: 1027 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
| * | be more consistent about CFG_EGL_GLES_INCLUDES interpretationRitt Konstantin2011-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | !"no" != "yes"; use the same condition in both places Merge-request: 1027 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
| * | fix build with -opengl es1 in some casesRitt Konstantin2011-01-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try <GLES/egl.h> first, and if that fails, try <EGL/egl.h>. if CFG_EGL_GLES_INCLUDES is "no", then QT_GLES_EGL is not defined and type re-definitions in GLES/egltypes.h and EGL/egl.h might occur later. Merge-request: 1027 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
| * | don't include harfbuzz where we don't use itRitt Konstantin2011-01-205-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | this only added extra noise to the output... Merge-request: 1028 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
| * | don't assign MANIFEST_DIR if we don't need itOswald Buddenhagen2011-01-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | avoids warnings with qmake -Wall about overriding the variable (as typically both scripts are in CONFIG, but only one is actually used). Task-number: QTBUG-13911 Reviewed-by: mariusSO
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-201-22/+34
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Improved QMAKE_POST_LINK support in symbian-sbsv2
| * | Improved QMAKE_POST_LINK support in symbian-sbsv2Miikka Heikkinen2011-01-201-22/+34
|/ / | | | | | | | | | | | | | | | | | | | | | | QMAKE_POST_LINK value handling now uses the same automatic replacements as QMAKE_EXTRA_COMPILERS and QMAKE_EXTRA_TARGETS handling. In practice this means that it is now possible to use $$QMAKE_COPY and friends in QMAKE_POST_LINK value also with symbian-sbsv2 mkspec, and that any backslashes in the value are assumed to be path separators and will be converted to forward slashes. Task-number: QTBUG-16753 Reviewed-by: Janne Koskinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-203-12/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Switch default Phonon backend on Symbian from Helix to MMF Do not load aplication fonts on Symbian^1 and below Fix compilation error.
| * | Switch default Phonon backend on Symbian from Helix to MMFGareth Stockwell2011-01-191-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | If both plugins are present on a device, the MMF backend is now loaded by default. Task-number: QT-4472 Reviewed-by: Justin McPherson
| * | Do not load aplication fonts on Symbian^1 and belowAlessandro Portale2011-01-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read http://bugreports.qt.nokia.com/browse/QTBUG-16514 for a recipy to reboot the phone just by handling with fonts. Symbian^1 is vulnerable, and Symbain^3 prevents a phone reboot. Therefore, I prefer to disable the app font feature for Symbian^1, until QTBUG-16514 us properly handled. Task-Number: QTBUG-16514
| * | Fix compilation error.Jason McDonald2011-01-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Protect #include of feature-specific header in #ifdef. Task-number: QTBUG-16652 Reviewed-by: Trust Me Acked-by: Jani Hautakangas
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-192-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use SRCDIR as a base path for the test data. Add the test data to the INSTALLS target
| * | | Use SRCDIR as a base path for the test data.Lucian Varlan2011-01-192-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test cannot run on harmattan CI system, which executes it from a different directory than the one where the executable resides. Reviewed-by: Adrian Constantin Reviewed-by: Harald Fernengel
| * | | Add the test data to the INSTALLS targetAdrian Constantin2011-01-191-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: Lucian Varlan
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-192-2/+18
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Cleanup created views in TextEdit tests. TextEdit implicit size varied depending upon wrapMode.
| * | | Cleanup created views in TextEdit tests.Martin Jones2011-01-191-0/+12
| | | | | | | | | | | | | | | | Reviewed-by: Michael Brasser
| * | | TextEdit implicit size varied depending upon wrapMode.Martin Jones2011-01-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We failed to reset textWidth before calculating the ideal width of the text. Task-number: QTBUG-16710 Reviewed-by: Michael Brasser
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-194-28/+225
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Supporting Qt application fonts on Symbian
| * | | | Supporting Qt application fonts on SymbianAlessandro Portale2011-01-194-28/+225
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch finally implements the missing application font support on Symbian. QFontDatabase's addApplicationFont[FromData], applicationFontFamilies and removeApplicationFont are now functional and allow an application to load, use and unload fonts at run-time. The underlying Symbian API comes with some restrictions/specialties. Most of them are worked around in this patch, the missing ones are left as part of QTBUG-16514: - The font file must be a file, not a memory buffer. Web fonts and qrc fonts come as memory buffers. These buffers are saved to a temporary .ttf file and the file is loaded by the underlying Symbian API. The temporary file can only be deleted after the font is unloaded. - The font file must be in a public location in order to be loadable by Symbian. It can for example not reside in the private application directory. Therefore, all application fonts (also those that are on the file system) become a temporary .ttf file in c:\temp\. - Symbian3/PR2 will come with a font table API which provides direct access to font tables. Symbian3/PR1 and below are missing this API, therefore, an own TFontStore is (ab)used to read font tables out of a font. This patch is considering both code paths in several occasions, making the Qt Symbian font implementation significantly less maintainable. - The fonts are loaded into Symbian's central font server. Loaded fonts from different processes can have colliding font typeface names (not file names) on that server. The server does not separate loaded fonts by their origin processes. Working around such collisions is part of QTBUG-16514. The number of fonts loadable at the same time by a Qt application is limited to the random value 5. Just to prevent abuse of the font server's memory. As usual, this patch was looked at by colleagues, and it was adjusted according to the feedback. But since the bus factor for the interaction of Qt's and Symbian's font systems is 1, I reviewed this patch, myself. Task-Number: QTBUG-6611 Autotest: tst_QFontDatabase::addAppFont
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-192-16/+9
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix doubleformat config.test stabilize qmake autotest
| * | fix doubleformat config.testRitt Konstantin2011-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | add 0.0 at the end to be treated like trailing null (\0) by some versions of 'strings' cli tool Merge-request: 2550 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | stabilize qmake autotestRitt Konstantin2011-01-191-15/+8
|/ / | | | | | | | | | | | | | | | | | | on a systems with small packet windows, QProcess::readAllStandardError() might return a part of the string and the existing code adds an endl to it a bit later, causing a test failure. (I don't care about the '\r'-s here because of QString shall eat them anyways) Merge-request: 2546 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-184-4/+191
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "Add a warning about trying to release a timer ID that isn't active" Some unit tests for layout explosion thingy Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f Build failure fix (related to QT-4079) QWidgets support for VGA screen
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-184-4/+191
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "Add a warning about trying to release a timer ID that isn't active" Some unit tests for layout explosion thingy Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f Build failure fix (related to QT-4079) QWidgets support for VGA screen
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-184-4/+191
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "Add a warning about trying to release a timer ID that isn't active" Some unit tests for layout explosion thingy Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f Build failure fix (related to QT-4079) QWidgets support for VGA screen
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-175-5/+191
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "Add a warning about trying to release a timer ID that isn't active" Some unit tests for layout explosion thingy Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f Build failure fix (related to QT-4079) QWidgets support for VGA screen
| | | | * \ Merge branch '4.7-review' into 4.7-stagingThierry Bastian2011-01-175-5/+191
| | | | |\ \
| | | | | * \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-141-1/+0
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Revert "Add a warning about trying to release a timer ID that isn't active"
| | | | | | * | Revert "Add a warning about trying to release a timer ID that isn't active"Jan-Arve Sæther2011-01-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e1955231478df8990cf8b1f80438abf957c5d6f2. In a patch release this is the best way of fixing the problem of warnings. This will be fixed properly in 4.8 Reviewed-by: Gabriel Task-number: QTBUG-16175
| | | | | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-133-2/+187
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Some unit tests for layout explosion thingy Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
| | | | | | * | Some unit tests for layout explosion thingyJohn Tapsell2011-01-131-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds more tests for commit 7fbf1829e11504eca6a55f1e5dbddf2f658b5302 Task-number: QTBUG-13551
| | | | | | * | Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005fJan-Arve Sæther2011-01-132-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug has been around for a while, but change 604c51f1fc5c7 made it emerge. The problem was that stretches were combined by always *maxing* them. The values of 'stretch' can be interpreted as this: -1: (the default) it means that the items should be stretched with the stretch factor dervived from the size hints. (In practice this means that they are distributed fairly). 0: Means that the item should not be stretched >0: Means that the item should be stretch with that number as a factor. This meant that combining one item with a fixed size(0) and another item with a default stretch (-1) the combined row stretch would end up being fixed. This also fixes how stretches are combined for spanning items too. Task-number: QTBUG-13551 Reviewed-by: John Tapsell
generated by cgit v0.12 at 2025-03-20 15:55:27 (GMT)