summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-2598-6109/+7251
|\ | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-253-23/+343
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Avoid possible font name collisions on fbserv
| | * Avoid possible font name collisions on fbservAlessandro Portale2011-01-243-23/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-6611 implemented the long awaited app font support on Symbian. One of the problems with the underlying Symbian Api for font loading is that all fonts go into one system wide font store on fbserv. All fonts are visible to and accessible by every application. And there is no way to find out if a font is an app font and whose process' app font it is. If a font with a certain family name is already loaded on fbserv, no other application can load its font with the same family name. If two applications access the same font, bad things can happen (details: QTBUG-16514). This patch works around naming collisions on the fbserv. It also prevents Qt applications from using other Qt applications' app fonts. It does so by "marking" the name of the temporary ttf file before the file gets loaded by fbserv. All font name strings in the font's 'name' table get a marker string appended. The marker is composed by a "Q", the uid3, and on Symbian^3|PR1&below the pid. The marker length is four characters. When the QFontDatabase is populated, all own app font names are cleand from the marker, so that the Qt app can use the original font name. Other applications' app fonts are detected and filtered out of the own font database. Symbian's font Api supports only 24 characters as names for font families. The name marker reduces the effective characters to 20. The reduced name length is documented for QFontDatabase::addApplication[FontFromData] as a note. Since the app font feature is much safer now, it got re-enabled for Symbian^1 and below by reverting 25ac59fcf1bb03c9af9a2c967218c96c7c77361a . Task-number: QTBUG-16514
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-245-4225/+4148
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update of Czech translation for Qt 4.7-stable
| | * Update of Czech translation for Qt 4.7-stablePavel Fric2011-01-245-4225/+4148
| |/ | | | | | | | | Merge-request: 2553 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-01-242-18/+7
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix crash in QtScript/JSC stack allocator on Symbian HTTP: fix digest authentication
| | * Fix crash in QtScript/JSC stack allocator on SymbianKent Hansen2011-01-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reserved (virtual) size of the chunk is not necessarily a multiple of the "pool" size (the physical growth increment). The reserved size is only rounded up to a multiple of the page size (4K), not the pool size (64K). This meant that the commit of the _last_ part of the chunk could (and did) fail, because we tried to commit 64K while only a size <64K was remaining. Detect this case and reduce the requested size accordingly. Also add a call to CRASH() in case Commit() returns an error, to avoid obscure crashes in JSC at a later point (grow() must not fail). Task-number: QTBUG-16685 Reviewed-by: Simon Hausmann
| | * HTTP: fix digest authenticationPeter Hartmann2011-01-241-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | no need to extract the realm from the user; with digest authentication the realm is an attribute of its own. Reviewed-by: Markus Goetz Task-number: QTBUG-15070
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-241-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed UTF-8 application names in device application menu in Symbian
| | * | Fixed UTF-8 application names in device application menu in SymbianMiikka Heikkinen2011-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHARACTER_SET UTF8 statement was missing from generated .rss file, causing localized application names containing UTF-8 characters to be rendered incorrectly. Task-number: QT-4476 Reviewed-by: axis
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-241-2/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix loop count in animanted gifs sometimes being incorrect
| | * | Fix loop count in animanted gifs sometimes being incorrectSimon Hausmann2011-01-241-2/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | Applied patch supplied in QT-4426, which also completes https://bugs.webkit.org/show_bug.cgi?id=36818 Task-number: QT-4426 Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-211-2/+18
| |\ \ | | |/ | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Validate arguments to QDBusConnection::connect
| | * Validate arguments to QDBusConnection::connectThiago Macieira2011-01-211-2/+18
| |/ | | | | | | | | | | | | | | This fixes a crash caused by user code trying to connect to object paths that aren't valid (if we send this to the bus daemon, we get an error with the AddMatch call). Reviewed-by: Trust Me
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-218-23/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: make the test a bit stricter ignore the warning from auto-detach in destructor get rid of extra calls to handle() simplify QSharedMemory::detach() avoid extra calculations fix error reporting on detach() fix error reporting Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.
| | * 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
generated by cgit v0.12 at 2024-12-05 00:26:41 (GMT)