summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed an issue with pixmaps not being released correctly in the GL 1 engine.Trond Kjernåsen2010-05-101-0/+5
| | | | | | | | | | When a pixmap is bound using the texture_from_pixmap extension we retain a reference to the pixmap to stop us destroying it before swapBuffers() or glFlush() is called. The references were not cleared out correctly in the GL 1 engine. Task-number: QTBUG-10529 Reviewed-by: Samuel
* QSystemTrayIcon: put WinCE specific code into qsystemtrayicon_wince.cppJoerg Bornemann2010-05-073-54/+303
| | | | | | | | The desktop Windows and Windows CE code paths diverged too much. Splitting it up now and making it work on WinCE again. Task-number: QTBUG-4828 Reviewed-by: mauricek
* Windows CE: fix multiple QAction::triggered() signalsJoerg Bornemann2010-05-075-17/+22
| | | | | | | | | Adding the same menu action object to n menu bars resulted in n QAction::triggered() signals. Now, we're comparing the active window with the parent HWND of the menu bar before triggering. Task-number: QTBUG-10402 Reviewed-by: thartman
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-071-0/+9
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed line and point drawing for the PS/PDF generators.
| * Fixed line and point drawing for the PS/PDF generators.Trond Kjernåsen2010-05-071-0/+9
| | | | | | | | | | | | | | | | | | Some lines and points could appear with artifacts when printed or viewed in a pdf viewer. If a brush was set we also generated a fill for the line/point, which was not correct. Task-number: QTBUG-8451 Reviewed-by: Gunnar
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-07101-18/+13802
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: Sliders are too small QLineEdit / QDateEdit - white font on white background Corrected headers for spectrum analyzer demo QS60Style: QCalendarWidget draws only one-digit dates Add spectrum analyzer demo app
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-07101-18/+13802
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: Sliders are too small QLineEdit / QDateEdit - white font on white background Corrected headers for spectrum analyzer demo QS60Style: QCalendarWidget draws only one-digit dates Add spectrum analyzer demo app
| * | QS60Style: Sliders are too smallSami Merila2010-05-062-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometime back slider graphic in the QS60Style was changed to use the "new" slider graphic available in 5th Edition and newer SDKs (the old SDKs still use the slider graphic). However, at that time nobody noticed that the new slider has different size than the old one in the Nokia LAF document. To fix the sliders, updated the pixel metrics calculation rules to use the new slider LAF data. Also fixed a grpahic start and end part rounding to match native look. Task-number: QTBUG-10454 Reviewed-by: Alessandro Portale
| * | QLineEdit / QDateEdit - white font on white backgroundSami Merila2010-05-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently QCoeFepInputContext uses default QLineEdit palette when setting up text format before passing the formatted text to native side (which uses it, for example, to show T9 suggested words). The above way is incorrect due to two reasons: - custom widget might not be anything like QLineEdit and might have really different palette from it - it ignores stylesheets (or modifications to the QLineEdit's palette) Therefore, the color for text format is picked up from focusWidget, if it is available (in most cases it should be). If the focusWidget is not available, then QLineEdit default palette is used. Task-number: QTBUG-9480 Reviewed-by: Janne Koskinen
| * | Corrected headers for spectrum analyzer demoGareth Stockwell2010-05-0672-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | - Added /3rdparty/ to directory path for FFTReal code - Added missing $QT_BEGIN_LICENSE$, $QT_END_LICENSE$ - Fixed incorrect license in app/wavfile.cpp Reviewed-by: trustme
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-0699-0/+13752
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QCalendarWidget draws only one-digit dates Add spectrum analyzer demo app
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-0599-0/+13752
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QCalendarWidget draws only one-digit dates Add spectrum analyzer demo app
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-05-05102-6/+13757
| | | |\ \
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-0598-0/+13744
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add spectrum analyzer demo app
| | | | | * | Add spectrum analyzer demo appGareth Stockwell2010-05-0598-0/+13744
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis. Reviewed-by: Alessandro Portale
| | | * | | | QS60Style: QCalendarWidget draws only one-digit datesSami Merila2010-05-051-0/+8
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to largish pixel metrics values for text margins, content does not fit into QCalendarWidget date-cells. To fix this, the failing pixel metric values are halved for QTableViews and its derivatives. This matches native margins almost perfectly (depending on native layout 1-2 pixel offset). Task-number: QTBUG-10417 Reviewed-by: Alessandro Portale
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-068-9/+82
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bug in QIODevice::read after first reading 0 bytes. Recalculate script item widths when forcing justification QGraphicsWidget was not working properly when ItemSendsPositionChanges is false
| * | | | Fixed bug in QIODevice::read after first reading 0 bytes.Samuel Rødal2010-05-062-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 02532ec80375c686503c4250c6ad6bb211515ec8 removed the early-exit for 0 byte reads, causing us to hit code that assumed the buffer was empty since nothing was read. It would thus read more into the end of the buffer, causing the buffer to grow bigger than QIODEVICE_BUFFERSIZE. Next, if the actual number of bytes we wanted to read was bigger than the original buffer size we'd read the same data twice. Reviewed-by: João Abecasis Reviewed-by: Thiago Macieira
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2010-05-069-27/+60
| |\ \ \ \
| | * | | | QGraphicsWidget was not working properly when ItemSendsPositionChanges is falseAlexis Menard2010-05-055-7/+46
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The geometry was not properly set because QGraphicsWidget rely on itemChange to update its own geometry. Now when calling setPos we also ensure that for a widget the geometry will be up to date. Setting the flag ItemSendsPositionChanges to false for a given widget will give a small performance boost. Reviewed-by:janarve Reviewed-by:bnilsen
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-053-5/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix qt_wince_bsearch for low nonexistent key values WindowsMobileStyle: fix QTreeView indicator size document that QMenuBar::setDefaultAction is only available on Win Mobile
* \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-054-20/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QHostInfo: Remove unused includes QNAM HTTP: Start more requests in once function call
| * | | | | QHostInfo: Remove unused includesRitt Konstantin2010-05-053-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | | | | QNAM HTTP: Start more requests in once function callMarkus Goetz2010-05-051-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | | * | | Recalculate script item widths when forcing justificationEskil Abrahamsen Blomfeldt2010-05-061-2/+7
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When going through the special WebKit code path for text drawing and forcing justification for text, we would set the justification in the text engine, but never actually update the widths of the script items. Since the width of the script item is used to position the text, the text would be drawn with the correct justification, but the position would be set based on the non-justified text width. The result was overlapping text whenever the script of the text changed. The fix goes through the justified glyphs and sets the width and position based on the new effective advance. Task-number: QTBUG-10421 Reviewed-by: Simon Hausmann
| | * | | fix qt_wince_bsearch for low nonexistent key valuesJoerg Bornemann2010-05-051-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10043 Reviewed-by: thartman
| | * | | WindowsMobileStyle: fix QTreeView indicator sizeJoerg Bornemann2010-05-051-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7364 Reviewed-by: thartman
| | * | | document that QMenuBar::setDefaultAction is only available on Win MobileJoerg Bornemann2010-05-051-1/+1
| |/ / / |/| | | | | | | | | | | Task-number: QTBUG-8393
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-051-52/+82
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: WinCE: QMenuBar::triggered(QAction*) was emitted too often coding style changes in qmenu_wince.cpp
| * | | WinCE: QMenuBar::triggered(QAction*) was emitted too oftenJoerg Bornemann2010-05-051-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QMenuPrivate::activateAction instead of QAction::activate makes use of the internal recursion guard and fixes this problem. Also emitting QMenuBar::triggered in the command-in-menu-bar case will QAction::activate do for us. Task-number: QTBUG-10358 Reviewed-by: thartman
| * | | coding style changes in qmenu_wince.cppJoerg Bornemann2010-05-051-48/+79
| | | |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-042-2/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix combobox backgroundrole not respected in some styles Allow QtDBus to be compiled as a static library on Windows.
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-042-2/+7
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix combobox backgroundrole not respected in some styles Allow QtDBus to be compiled as a static library on Windows.
| * | | Fix combobox backgroundrole not respected in some stylesJens Bache-Wiig2010-05-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was a regression in 4.5 since we introduced styling. We now set the background role as the menuoption palette when available. Reviewed-by: ogoffart Task-number: QTBUG-10403
| * | | Allow QtDBus to be compiled as a static library on Windows.Thomas Sondergaard2010-05-041-1/+3
| | | | | | | | | | | | | | | | | | | | Merge-request: 569 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-041-3/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: When one of the spin button subcontrol is activated, the state member of
| * | | When one of the spin button subcontrol is activated, the state member ofKevin Ottens2010-05-041-3/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | the style option object should have QStyle::State_Sunken set in order for styles to paint the button as pressed. Merge-Request: 607 Reviewed-by: Andreas
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-041-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix crash in QLocalServer::close on Windows
| * | fix crash in QLocalServer::close on WindowsJoerg Bornemann2010-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | If _q_onNewConnection failed, then QLocalServer got into a bad state. QLocalServer::isListening() still returned true and QLocalServer::close() crashed. Task-number: QTBUG-10388 Reviewed-by: ossi
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-041-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QTabWidget icon size property doesn't work
| * | | QS60Style: QTabWidget icon size property doesn't workSami Merila2010-05-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style did check if the tab icon size was larger than pixel metric for default tab icon size. If it was, then it reset the icon size to match pixel metric. It was impossible to set large icon to tab widget. As a fix, this check was removed from style. Task-number: QTBUG-3102 Reviewed-by: Jason Barron
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-041-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: PowerVR screen driver using undefined symbols
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-031-1/+1
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: PowerVR screen driver using undefined symbols
| * | | PowerVR screen driver using undefined symbolsRhys Weatherley2010-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PowerVR screen driver was using QTransformedScreen::tranformation() which is in a class that is Q_AUTOTEST_EXPORT. That means that it would only work with a developer build. This contributed patch changes it to QScreen::transformOrientation() instead which is Q_GUI_EXPORT. Task-number: QTBUG-10193 Reviewed-by: Lorn Potter
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-032-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: rename qt_iw.ts to qt_he.ts
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-032-1/+1
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: rename qt_iw.ts to qt_he.ts
| * | | rename qt_iw.ts to qt_he.tsOswald Buddenhagen2010-05-032-1/+1
| | | | | | | | | | | | | | | | | | | | iw comes from the obsolete ISO639. we are using ISO639-1 or something newer.
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-031-0/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QComboBoxPrivateScroller draws holes into menu canvas
| * | | QS60Style: QComboBoxPrivateScroller draws holes into menu canvasSami Merila2010-05-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QComboBoxPrivateScroller calls eraserects for menu scroller areas, expecting the style to fill the gaps. Unfortunately, the QS60Style does not draw menu scrollers at all (but they are functional when interacted with). Therefore, these areas are now drawn as holes. As a fix, the eraseRect call from provate class QComboBoxPrivateScroller is removed when "s60 flag" is defined. Task-number: QTBUG-10371 Reviewed-by: Janne Koskinen
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-032-11/+94
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QTabWidget Usability issue with capacitive screens
generated by cgit v0.12 at 2025-04-03 00:39:17 (GMT)