summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow to build Qt in static with mingwThierry Bastian2010-06-076-8/+6
| | | | | | | | | | Some functions were marked with Q_DECL_IMPORT where they should just be Q_CORE_EXPORT. The reason is that this macro is expanded to nothing in case of static builds whereas Q_DECL_IMPORT isn't (it is a dllimport). That leads the linker to try to import it and it shouldn't. Task-number: QTBUG-10791 Reviewed-by: gabi
* Protected call to glXChooseFBConfig with appropriate defines.Samuel Rødal2010-06-071-0/+11
| | | | Reviewed-by: Trond
* Use the new OpenGL 3.* context/profile if asked with X11/GLX.Riku Palomäki2010-06-071-6/+69
| | | | | Merge-request: 609 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.Riku Palomäki2010-06-071-137/+144
| | | | | Merge-request: 609 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix QTransform::map(const QPainterPath &) not working with paths thatSimon Hausmann2010-06-072-1/+9
| | | | | | | | | have only one element Replaced the isEmpty() check for the shortcut in map() with elementCount() == 0 Task-number: QTBUG-11264 Reviewed-by: Samuel
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-0413-5307/+9657
|\ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Synchronizing to latest tree Adding correct hungarian translation Search local directory if no qconfig file found in src/corelib/global/ Fix QT_NO_CLIPBOARD Fix QT_NO_ACTION
| * Synchronizing to latest treeGarami Gábor2010-06-047-444/+1096
| | | | | | | | | | Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * Adding correct hungarian translationGarami Gábor2010-06-048-5244/+8928
| | | | | | | | | | | | | | | | | | | | | | | | | | translations/assistant_hu.ts: Translated: 231 of 231 (100%) translations/designer_hu.ts: Translated: 85 of 1248 (6%) translations/linguist_hu.ts: Translated: 393 of 393 (100%) translations/qtconfig_hu.ts: Translated: 73 of 168 (43%) translations/qt_help_hu.ts: Translated: 80 of 81 (98%) translations/qt_hu.ts: Translated: 2402 of 2464 (97%) translations/qvfb_hu.ts: Translated: 65 of 65 (100%) Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * Search local directory if no qconfig file found in src/corelib/global/Tasuku Suzuki2010-06-041-2/+8
| | | | | | | | | | | | | | | | | | | | configure script searched qconfig-local.h under src/corelib/global/ with "-qconfig local". After this commit, configure tries to find local directory if the file is not found in the path. Now you can pass the option like "-qconfig ./qconfig-myconfig.h" Merge-request: 2341 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * Fix QT_NO_CLIPBOARDTasuku Suzuki2010-06-042-1/+4
| | | | | | | | | | Merge-request: 658 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * Fix QT_NO_ACTIONTasuku Suzuki2010-06-042-1/+6
| | | | | | | | | | Merge-request: 657 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0417-244/+267
|\ \ | |/ |/| | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add a note to the Linguist docs stating XLIFF 1.0 is not supported remove spurious empty lines in the linguist tools' output don't use qWarning() - or even qFatal()! - gratuitously. Styled item view backgrounds in Gtk+ Ensure that we only have one QLayoutStruct struct by renaming the other
| * Add a note to the Linguist docs stating XLIFF 1.0 is not supportedAndy Shaw2010-06-041-2/+7
| | | | | | | | | | | | | | | | The earliest version we support is XLIFF 1.1, so now this is made clearer. Task-number: QTBUG-9193 Reviewed-by: Morten Engvoldsen
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0416-242/+260
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: remove spurious empty lines in the linguist tools' output don't use qWarning() - or even qFatal()! - gratuitously. Styled item view backgrounds in Gtk+ Ensure that we only have one QLayoutStruct struct by renaming the other
| | * remove spurious empty lines in the linguist tools' outputOswald Buddenhagen2010-06-036-18/+18
| | | | | | | | | | | | ConversionData::error() does already newline-terminate the strings.
| | * don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-0311-186/+178
| | | | | | | | | | | | Task-number: QTBUG-8044
| | * Styled item view backgrounds in Gtk+Jens Bache-Wiig2010-06-031-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were currently never themed but used a fake gradient to mimick ClearLooks. I had to add a workaround for the case where you were using custom QItemDelegates since this could result in styled background on tree branches but flat items. Task-number: QTBUG-11209 Reviewed-by: thorbjorn
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-06-0368-969/+1221
| | |\
| | * | Ensure that we only have one QLayoutStruct struct by renaming the otherAndy Shaw2010-06-031-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QTextDocumentLayout and QLayoutEngine code referred to their own instances of QLayoutStruct it was causing problems with the Visual Studio debugger as it kept confusing the two together. Reviewed-by: Eskil
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-0460-23/+339
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: tst_qgraphicsitem: stabilize on X11 Added OpenGL 3.3 and 4.0 recognition to QGLFormat Fix compilation: disable -no-feature-* for bootstrapped QString: Fix severals bugs when comparing with QStringRef QProgressBar: make accessors const. Changes: add patch for artificial emboldening Added static version of QGLFramebufferObject::release(). Fix compilation on WinXP MinGW32; Add a new qconfig feature GESTURES
| * | | tst_qgraphicsitem: stabilize on X11Olivier Goffart2010-06-031-0/+1
| | | |
| * | | Added OpenGL 3.3 and 4.0 recognition to QGLFormatSebastian Hartte2010-06-032-3/+23
| | | | | | | | | | | | | | | | | | | | Merge-request: 2404 Reviewed-by: Trond
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-0357-20/+315
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation: disable -no-feature-* for bootstrapped QString: Fix severals bugs when comparing with QStringRef QProgressBar: make accessors const. Changes: add patch for artificial emboldening Added static version of QGLFramebufferObject::release(). Fix compilation on WinXP MinGW32; Add a new qconfig feature GESTURES
| | * | Fix compilation: disable -no-feature-* for bootstrappedTasuku Suzuki2010-06-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | moc isn't compiled when qt is configured if -no-feature-datestring Merge-request: 2347 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | * | QString: Fix severals bugs when comparing with QStringRefOlivier Goffart2010-06-032-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the internal ucstricmp and ucstrcmp contains different bugs if the strings are not 0-terminated, as it is with QStringRef. - in ucstricmp, even if the pointer are the same, the lenght could be different - we used to deference the 'end' pointer, that would be 0 if the string ends with 0, but we cannot do that in the general case Task-number: QTBUG-10404 Reviewed-by: Denis
| | * | QProgressBar: make accessors const.Olivier Goffart2010-06-031-2/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11039 Reviewed-by: Thierry
| | * | Changes: add patch for artificial emboldeningMike FABIAN2010-06-022-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Details: Fixes http://bugreports.qt.nokia.com/browse/QTBUG-10596 Patch taken from https://bugzilla.novell.com/show_bug.cgi?id=374066 https://bugzillafiles.novell.org/attachment.cgi?id=232442 and http://code.google.com/p/gentoo-taiwan/source/browse/trunk/x11-libs/qt-gui/files/synthetic-bold-4.5.diff?spec=svn298&r=298 and slightly edited. Moving the two lines concerning the underlining is unrelated to the emboldening but seems to make sense anyway, the comment "//underline metrics" seems to be misplaced before the "if (FT_IS_SCALABLE(face)) {| The hunk: @@ -789,6 +794,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyphMetrics(QGlyphSet *set, uint glyph } FT_GlyphSlot slot = face->glyph; + if (embolden) FT_GlyphSlot_Embolden(slot); int left = slot->metrics.horiBearingX; int right = slot->metrics.horiBearingX + slot->metrics.width; int top = slot->metrics.horiBearingY; seems to be logical but it is apparently not used when running my test program, i.e. synthetic emboldening in my test program works even without this hunk. Merge-request: 635 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| | * | Added static version of QGLFramebufferObject::release().Kim Motoyoshi Kalland2010-06-022-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | The function is marked internal for now. Reviewed-by: Gunnar
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-0249-11/+218
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation on WinXP MinGW32; Add a new qconfig feature GESTURES
| | | * | Fix compilation on WinXP MinGW32;lit-uriy2010-06-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, I get an error when building plug QODBC: drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCPrivate*, int*)': drivers\odbc\qsql_odbc.cpp:264: error: 'class QStringBuilder<QStringBuilder<QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>, QLatin1Char>, QString>' has no member named 'simplified' drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCDriverPrivate*, int*)': drivers\odbc\qsql_odbc.cpp:270: error: 'class QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>' has no member named 'simplified' drivers\odbc\qsql_odbc.cpp: In function 'QString qGetStringData(void*, int, int, bool)': drivers\odbc\qsql_odbc.cpp:403: warning: comparison between signed and unsigned integer expressions drivers\odbc\qsql_odbc.cpp:444: warning: comparison between signed and unsigned integer expressions Env: Windows XP SP2 MinGW (GCC 4.4.0 from trolls ftp) Merge-request: 2402 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | | * | Add a new qconfig feature GESTURESTasuku Suzuki2010-06-0248-9/+216
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 535 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-0335-43/+876
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Using Symbian's future font table getter Api Standalone Qml demos for Fluidlauncher Fixed S60_VERSION variable exists checks
| * | | | | Using Symbian's future font table getter ApiAlessandro Portale2010-06-033-35/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt requires raw access to the font tables of used fonts, for a variety of reasons. Until Symbian^4, it is/was not possible to access the font tables of the fonts which are stored in Symbians Font and Bitmap Server. That's why Qt for Symbian's FontDataBase created an own TFontStore where it loaded in all installed fonts. While accessing the font tables via the own TFontStore it still uses the rasterization and metrics from the FBS, which has public Api for those things. However, loading all fonts in the own TFontStore for each Qt Gui process slows down the program startup. Symbian's future font table setter Api is very welcome and this implemets it's usage. This patch lets Qt use the new font API on Symbain^4. The font tables are retrieved via RFontTable. Task-number: QT-2746 Reviewed-by: Jason Barron
| * | | | | Standalone Qml demos for FluidlauncherAlessandro Portale2010-06-0331-0/+725
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There new Qml demos are self-contained Qml applications, ready to be run on Symbian devices: qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter Since these depend on the DEPLOYMENT feature of qmake, they currently will only work for Symbian and theoretically WinCE/Mobile. TODO: create INSTALLS rules in order to support more platforms. Task-number: QTBUG-10148 Reviewed-By: axis
| * | | | | Fixed S60_VERSION variable exists checksMiikka Heikkinen2010-06-031-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently else:exists(xxx)|exists(yyy) syntax doesn't work as I originally expected if both xxx and yyy exist, so change the check to use nested exists. Reviewed-by: Jason Barron
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-0313-22/+155
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 9a83f22bc41a2016b6bbf495bfd32b3a659038c8 Fix versioning of pkg files on Symbian for apps linking against WebKit Updated WebKit to f59a934694947496cedecc5256a71bff60c43c4c
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-0213-22/+155
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 9a83f22bc41a2016b6bbf495bfd32b3a659038c8 Fix versioning of pkg files on Symbian for apps linking against WebKit Updated WebKit to f59a934694947496cedecc5256a71bff60c43c4c
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-0113-22/+155
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 9a83f22bc41a2016b6bbf495bfd32b3a659038c8 Fix versioning of pkg files on Symbian for apps linking against WebKit Updated WebKit to f59a934694947496cedecc5256a71bff60c43c4c
| | | * | | | Updated WebKit to 9a83f22bc41a2016b6bbf495bfd32b3a659038c8Simon Hausmann2010-06-0110-18/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/36826> || [Qt] QtWebkit.pc is broken || || <https://webkit.org/b/39189> || Bring CanvasRenderingContext2D's createImageData() in line with HTML5 spec || || <https://webkit.org/b/39175> || Properly handle invalid arguments to CanvasRenderingContext2D's getImageData() and putImageData() || As well as fixes for the qt_webkit_version.pri module installation.
| | | * | | | Fix versioning of pkg files on Symbian for apps linking against WebKitSimon Hausmann2010-06-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently features/symbian/qt.prf defaults to the qt version for WebKit when it comes with Qt from src/3rdparty. Instead of defaulting to the Qt version, pick up the real version from src/3rdparty by including the .pri file. Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
| | | * | | | Updated WebKit to f59a934694947496cedecc5256a71bff60c43c4cSimon Hausmann2010-06-016-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/36826> || [Qt] QtWebkit.pc is broken || Plus a fix for the installation/setup of qt_webkit_version.pri
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0386-2246/+10893
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (30 commits) Revert "Split Symbian bearer plugin into three platform specfic plugins" Don't poll non-polling engines when configurations are in use. Doc: updating images Fix a corner case where a gesture sometimes doesn't start. write PO files without duplicated message ids my changes Fix failing bypassShaping autotest on the Mac OS X More Pixmap cache key optimizations QNAM: Improve child deletion order QSslCertificate: support large serial numbers Split Symbian bearer plugin into three platform specfic plugins Doc: adding offline docs to assistant and Qt Creator. Improving small docs and adding highlighting Some optimizations for QImage::load() fix setRawData() Fix QML crashes on the N900 doc: Added DITA XML generator Fix build failure on Symbian 3.1. Add the Qt::TextBypassShaping flag. QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows. Add my 4.7.0 changes ...
| * | | | | Revert "Split Symbian bearer plugin into three platform specfic plugins"Aaron McCarthy2010-06-037-81/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cd50f97a9f09eece645c9d7d01cb14c04521a915. Fails on tb9.2, reverting while working on a fix.
| * | | | | Don't poll non-polling engines when configurations are in use.Aaron McCarthy2010-06-031-2/+4
| | | | | |
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-06-022-0/+167
| |\ \ \ \ \
| | * | | | | Fix a corner case where a gesture sometimes doesn't start.Thomas Zander2010-06-022-0/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gestures are re-used per widget / recognizer and in the case of a gesture getting cancelled we sometimes didn't properly 'start' the gesture on new incoming events since the manager forgot to mark it as not running. Add a test case and a one line fix. Reviewed-by: Denis Task-number: QTBUG-11076
| * | | | | | Doc: updating imagesMorten Engvoldsen2010-06-0217-0/+0
| |/ / / / /
| * | | | | write PO files without duplicated message idsOswald Buddenhagen2010-06-022-7/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encoding the qt context as a magic comment was no particularly good idea, as it provided no disambiguation as far as gettext is concerned. so instead encode the context into msgctxt. Task-number: QTBUG-10307
| * | | | | my changesOswald Buddenhagen2010-06-021-6/+33
| | | | | |
| * | | | | Fix failing bypassShaping autotest on the Mac OS XSimon Hausmann2010-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test relies on integer metrics, so we need to force them for Mac OS X. Reviewed-by: Jocelyn Turcotte
generated by cgit v0.12 at 2025-09-11 00:39:26 (GMT)