summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add specific INTEGRITY cases for autotests requiring a target path.Rolland Dudemaine2011-11-158-2/+23
| | | | | | | | | SRCDIR is not parsed the same way due to the different qmake generation process. furthermore, the full host path doesn't seem like a good idea to use for the path of the target filesystem. Use "/" as default. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Improve default mkspec for INTEGRITY.Rolland Dudemaine2011-11-151-5/+6
| | | | | | | | | | | | More specifically : - add DEFINES for removing unsupported features - disable one more warning - specify non-shared-library mode - add hiddev library to linker list - fill debug mode flags Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use Q_FUNC_INFO without line number on GHS compiler.Rolland Dudemaine2011-11-151-1/+1
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Add INTEGRITY gbuild.* files to qmake project.Rolland Dudemaine2011-11-152-2/+5
| | | | | | | This allows building and debugging qmake from Qt Creator. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use the project root from .gpj project files, instead of local path.Rolland Dudemaine2011-11-151-3/+5
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Make sure QMAKE_CXX is defined to prevent crashing on some projects.Rolland Dudemaine2011-11-151-1/+3
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Add support for .pro-type subdirectories.Rolland Dudemaine2011-11-151-1/+1
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Add relative path to the work directory, to prevent filename clashes.Rolland Dudemaine2011-11-151-0/+4
| | | | | | | | This was causing issues for some examples, which are all consistently using main.cpp as the entry file. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Only call moc if the file needs it.Rolland Dudemaine2011-11-151-2/+3
| | | | | | | | | This applies to both headers and cpp files (use mocable()). Previously, moc was called on all cpp and h files, causing additional compilation time, and trouble on QSvgGenerator. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use outname to specify the output .gpj to generate.Rolland Dudemaine2011-11-151-3/+3
| | | | | | | | | This resolves several path issues as well. outname itself is now based on the first TARGET file, instead of using the output filename. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use "dll" instead of "shared".Rolland Dudemaine2011-11-151-1/+1
| | | | | | | | | | For DLLs (which are not supported, but may be soon), use the CONFIG variable "dll" instead of the "shared" template, because some testcases actually use shared even when compiled statically. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Instead of translating / into _, check if subdir is a .pro.Rolland Dudemaine2011-11-151-2/+4
| | | | | | | | | | Previously, .pro files were treated as directories, and a previous workaround for the issue was to replace / with _ in directory paths. This was both actually non-sensical and not effective. This resolves the issue by checking if the subdir has a .pro extension. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Do not generate -D defines for project types.Rolland Dudemaine2011-11-151-1/+2
| | | | | | | | | | | Options are implicitly inherited from project to subprojects and applications, so there is no need to respecify them. Worse, if an app/lib disables an option, the project might still have the define enabled, forcing it also onto the app/lib. This prevents double-define or this kind of conflict. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Clean up generated linker file for the shared library case.Rolland Dudemaine2011-11-151-9/+11
| | | | | | | Generated linker file was not looking good, now much better. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Make applications start by default (StartIt True).Rolland Dudemaine2011-11-151-0/+1
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Change the overload from write() to writeMakefile() in INTEGRITY generatorRolland Dudemaine2011-11-152-2/+2
| | | | | | | | This way, INTEGRITY-specific generation is only called in Makefile mode. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Resolve atomic operations issues on INTEGRITY.Rolland Dudemaine2011-11-151-3/+4
| | | | | | | Now passes atomicpointer autotest successfully. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"Friedemann Kleint2011-11-141-28/+0
| | | | | | | | | | The change introduces problems with Unity's global menu bar. Task-number: QTBUG-22420 Reviewed-by: denis <denis.dzyubenko@nokia.com> This reverts commit cdd776a91e65bf5c30cea1bab9823134a3f797d0.
* Fix QDockWidget titlebar button positioning on Mac OS XPasi Matilainen2011-11-141-0/+101
| | | | | | | | | Move the QDockWidget close and float buttons from the right end of the dock widget title bar to the left end to avoid Mac App Store rejection. Task-number: QTBUG-19493 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fixed memory leak in Windows Vista style widgetsTero Ahola2011-11-141-0/+1
| | | | | | | | | | | The animations are now deleted in destruction of the Vista style. With the previous implementation the animations were not deleted for instance if you move mouse cursor off from a widget with hover animation (like QPushButton). Task-number: QTBUG-21532 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix for QMessageBox's autotest.Mikko Knuutila2011-11-141-1/+2
| | | | | | | | Mnemonic shortcut caused string comparison to fail. Task-number: QTBUG-22119 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix for the button size calculation in qmessagebox.cppMikko Knuutila2011-11-141-1/+1
| | | | | | | | | Actually use the calculated size for needed space instead of just ignoring the return value. Task-number: QTBUG-16315 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fixed wrong QGroupBox check stateMarkku Heikkila2011-11-112-0/+27
| | | | | | | | Handle mouserelease only if mouse is pressed in QGroupBox. Task-number: QTBUG-19170 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Added base 10 to be used with QIntValidator.Mikko Knuutila2011-11-112-1/+11
| | | | | | | | | | Fixes an error in QIntValidator, which occurred because locale.toInt() was missing a parameter for base value and this led it to presume wrongly that a base 8 is in use. Task-number: QTBUG-21602 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Mac: Fix the color of check marks in menus with stylesheetTero Ahola2011-11-111-3/+7
| | | | | | | | Task-number: QTBUG-16989 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Morten Johan Sorvig <morten.sorvig@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Russian translation updateSergey Belyashov2011-11-111-11/+7
| | | | | Merge-request: 2715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't directly access QList contentsAlberto Mardegan2011-11-111-3/+6
| | | | | | | | | The existing code doesn't work on 64bit machines. We must first convert the list into a QVector, which guarantees that elements are laid out correctly as an array. Merge-request: 1467 Reviewed-by: thiago
* Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flagjahonkon2011-11-112-6/+3
| | | | | | | | | It is not possible to select text with keyboard when specifying only Qt::TextSelectableByKeyboard flag. Task-number: QTBUG-18952 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix QDateEdit calendar pop-up having wrong datejahonkon2011-11-111-0/+2
| | | | | | | | | | | | When the calendar pops up it moves the date to maximum instead of keeping the current date. Problem was caused by QCalendarPopup signalling date change to QDateTimeEdit during internal date synchronization from QDateTimeEdit to QCalendarPopup. Task-number: QTBUG-11422 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Repaint QProgressBar when minimum or maximum changedTero Ahola2011-11-102-4/+49
| | | | | | | | | | The implementation of QProgressBar::setMinimum and setMaximum did not repaint the widget. This caused the widget to be shown incorrectly in case you call setMinimum or setMaximum but not setValue. Task-number: QTBUG-22121 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix QProgressBar causing timer event spamTero Ahola2011-11-102-23/+37
| | | | | | | | | | | On Windows you will get a lot of timer events if you use QProgressBar widget. This is because QWindowsStyle uses a timer to animate a progress bar with unknown state (min and max values both zero). The issue was fixed by starting the timer only if needed. Task-number: QTBUG-10501 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Compile fix for Mac OS X 10.7 with 10.6 sdkAndy Shaw2011-11-101-2/+2
| | | | | | | | | | | Since it is an example it is cleaner to just include the header file as it will be available on other platforms anyway. Also ensured that the Qt includes were first before the system ones. Task-number: QTBUG-22641 Merge-request: 1462 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-082-3/+18
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Qt Designer: Fix static linking on Mac.
| * Qt Designer: Fix static linking on Mac.Friedemann Kleint2011-11-082-3/+18
| | | | | | | | | | | | | | | | | | Add a comment in shared.pri explaining the problem. See also e7762b60d519c9ae4b47f6c4ceece584408247ea Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-22542
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-081-0/+3
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: SSL: blacklist intermediate certificates that issued weak certs
| * | SSL: blacklist intermediate certificates that issued weak certsPeter Hartmann2011-11-081-0/+3
| | | | | | | | | | | | | | | | | | | | | ... as did browser vendors. Tested manually with affected CA certificates. Reviewed-by: Richard J. Moore <rich@kde.org>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-081-0/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Give better error message when using unsupported lookbehinds in QRegExp
| * | Give better error message when using unsupported lookbehinds in QRegExpKjell Rune Skaaraas2011-11-071-0/+4
| | | | | | | | | | | | | | | Merge-request: 1456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-11-041-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT Add GL_EXT_texture_format_BGRA8888 support. Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem" Correction for effectiveBoundingRect() calculation for QGraphicsItem
| * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-031-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT Add GL_EXT_texture_format_BGRA8888 support.
| | * | | Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXTJani Hautakangas2011-11-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glGetBooleanv generates an error if this param isn't supported. This error generates wrong warnings in later states. Reviewed-by: Eskil
| | * | | Add GL_EXT_texture_format_BGRA8888 support.Jani Hautakangas2011-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtOpenGL supports GL_IMG_texture_format_BGRA8888 but GL_EXT_texture_format_BGRA8888 is missing. These extensions are essentially the same. Task-number: QTBUG-22538 Reviewed-by: Samuel Rødal
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-030-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem" Correction for effectiveBoundingRect() calculation for QGraphicsItem
| | * | | Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem"Samuel Rødal2011-11-032-45/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7925f107814e46deb0848d9e6016721ceebfb521. Needed to fix regressed auto-test tst_qgraphicsview::update_ancestorClipsChildrenToShape2.
| | * | | Correction for effectiveBoundingRect() calculation for QGraphicsItemChristophe Oosterlynck2011-11-022-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItemPrivate::effectiveBoundingRect() should use ItemClipsChildrenToShape flag from the parent while looping to check for clipping and not use its own AncestorClipsChildren flag. By using AncestorClipsChildren, you're checking if one of your ancestors clips you, but you really want to know if your direct parent clips you. Merge-request: 1419 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-0292-346/+929
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (67 commits) Missing icon in the designer documentation Fridge magnet example code snippet error qpaintdevice-qt3.html documentation errors QWebElement example missed information QSPlitter style-sheet example was invalid Errors in QSqlDriver::handle examples QGLColormap example was invalid QPointer made no mention of QWeakPointer Invalid links to http://developer.symbian.org QNetworkDiskCache documentation missed information QStyleSheet example used a property that is hidden. QList document referenced to non existing function QXmlQuery::bindVariable documentation bug Fix multiple typos in QLineF documentation. Qmake project file docs lacked information. Documentation error in SSL document Fix multiple typos in documentation. Fix for QVector::toList - code example documentation. Supporting parallel pointer event delivery on Symbian SSL documentation: correct enum name ...
| | * | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-11-0292-346/+929
| | |\ \ \
* | | \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-11-0314-9/+367
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916
| * | | | | | Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas KlingAndreas Kling2011-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sentences should end with a period! (Poor man's rebuild trigger.)
| * | | | | | Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza ↵Ademar de Souza Reis Jr2011-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reis Jr Workaround MSVC2010 problems when linking QtWebKit Include MSVC2010 in the list of compilers where incremental build is disabled (INCREMENTAL:NO). Change suggested by Simo Falt <simo.falt@nokia.com>
generated by cgit v0.12 at 2024-12-30 19:42:26 (GMT)