summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* My changes.jasplin2009-04-141-0/+11
|
* Remove duplicate defines in the mac accessibility module.Morten Sørvig2009-04-141-122/+0
| | | | | | This was causing compile warnings. Reviewed-by: nrc
* Fix typo.Morten Sørvig2009-04-141-1/+1
| | | | Reviewed-by: nrc
* Allow "i386" as an alias for x86 for Mac universal buildsMorten Sørvig2009-04-141-2/+5
| | | | | | GCC uses i386, but configure has always used x86, which can lead to confusion. Reviewed-by: nrc
* Fix spelling errorMorten Sørvig2009-04-141-1/+1
| | | | Reviewed-by: TrustMe
* Fixes compile of WebKit with MinGW when using any `-j' option to buildRohan McGovern2009-04-131-23/+39
| | | | | | | | | | | | | | | | | | | | in parallel. On Windows, when a project has a lot of INCLUDEPATHs, some extra logic takes place to work around an issue of large command lines. Instead of passing all the paths directly to moc.exe, the paths are written to mocinclude.tmp which is then read from by moc.exe. Prior to this change, every moc rule tries to write to mocinclude.tmp. When running make with -j, this will happen in parallel, causing this error message: "The process cannot access the file because it is being used by another process" Change the logic so mocinclude.tmp is generated by its own rule. Reviewed-by: Lincoln Ramsay
* Beautify displayArgs parsingAnders Bakken2009-04-091-12/+18
| | | | | | | | Also add support for setting the width and height of the primary surface using display arguments (which can be good when debugging performace issues). Reviewed-by: Donald <qt-info@nokia.com>
* Take out the DSCAPS_TRIPLE when not blittingAnders Bakken2009-04-091-7/+0
| | | | | | | | | | When this code was written there was never a case when we would not blit our flips and hence the entire if (!(flipFlags & DSFLIP_BLIT)) business seems not to have been tested anyway. Since I don't see the point of this I am taking it out. Might enable us to actually create the primary surface in video memory more often. Reviewed-by: TrustMe
* Better warnings when primary is not in videomemAnders Bakken2009-04-091-3/+5
| | | | | | | If connect options are set to include videoonly and creating the primary surface in video memory fails warn even in release mode. Reviewed-by: TrustMe
* Add a change description about DirectFBAnders Bakken2009-04-091-0/+1
| | | | Reviewed-by: TrustMe
* Clean up code a little and get rid extra memcpysAnders Bakken2009-04-091-48/+3
| | | | | | | | | The QVarLengthArray approach makes no sense with DirectFB. Draw.*s is a regular function call and the receiving function even memcpy's the data on arrival anyway. Just call the Draw.* functions one by one Reviewed-by: TrustMe
* Fix setOpacityAnders Bakken2009-04-091-6/+8
| | | | | | | | Opacity doesn't play well with PorterDuff so we need to disable the porter duff when opacity is set. Also the DSBLIT_SRC_PREMULTCOLOR flag is not the right thing for us. Reviewed-by: TrustMe
* Inline hasAlphaChannel and add pixelFormat getterAnders Bakken2009-04-092-7/+2
| | | | Reviewed-by: TrustMe
* Make sure to update the member opacity variableAnders Bakken2009-04-091-1/+2
| | | | Reviewed-by: TrustMe
* Revert "New binary for Windows configure"Maurice Kalinowski2009-04-091-0/+0
| | | | | | This reverts commit f0239a4983dd84b0e23c1e6f796c5c44dfde26b2. The old change did not write out QT_EDITION etc. to qconfig.h causing the build to break.
* Be smarter about alpha formatsAnders Bakken2009-04-093-32/+133
| | | | | | | | | Try harder to prevent blends by explicitly checking for alpha pixels in the source image (unless asked not to). Can be defined out by #defining QT_NO_DIRECTFB_OPAQUE_DETECTION Reviewed-by: Donald <qt-info@nokia.com>
* Make flipping and paintOnScreen work betterAnders Bakken2009-04-091-12/+14
| | | | | | | Make the paintOnScreen case paint directly on the primary surface if the size of the window surface == size of primary surface. Reviewed-by: Donald <qt-info@nokia.com>
* Diagnostic info when failing to create surfaceAnders Bakken2009-04-081-0/+10
| | | | | | | Only enabled in debug builds since it could something that should be ignored. Reviewed-by: Donald <qt-info@nokia.com>
* Fix up drawing/blitting/porterduff situationAnders Bakken2009-04-081-135/+77
| | | | | | | | | | This was rather broken previously. For example, porterduff mode does not play well with alpha values and blends. Also, setting the flags to the existing value is a noop in DirectFB (checked the code) so bool dirty approach buys us nothing. Reviewed-by: Donald <qt-info@nokia.com>
* Don't convert unsupported images for dfbAnders Bakken2009-04-081-9/+4
| | | | | | | Fall back to raster engine for formats not supported by dfb rather than converting the image to a supported format. Reviewed-by: Donald <qt-info@nokia.com>
* BT: Compilefix for Windows CE and namespacesThomas Hartmann2009-04-081-4/+6
| | | | | | RevBy: Mauricek Details: functions needs to be declared outside of the namespace
* Merge branch '4.5' of http://git.scm.dev.nokia.troll.no/qt/qt into 4.5Thomas Hartmann2009-04-084-4/+81
|\
| * BT: Fix a painting glitch in gtk combo boxJens Bache-Wiig2009-04-081-0/+4
| | | | | | | | | | | | | | This improves the look of combo box with gtk style which is somewhat a regression from 4.5.0 since we did not style this part before. Reviewed-by: nrc
| * My changes.Norwegian Rock Cat2009-04-081-0/+37
| |
| * Added some changes for 4.5.1Jens Bache-Wiig2009-04-081-1/+28
| |
| * update/fix configureMaurice Kalinowski2009-04-082-3/+12
| | | | | | | | | | | | | | | | Reviewed-by: Thiago - display the nokia internal usage text like on configure - instead of skipping the license check we need to actually call it to set QT_EDITION and friends properly. Otherwise the build gets broken.
* | Fixes: No navigation with alt for the native menubar (Windows CE)Thomas Hartmann2009-04-081-0/+3
|/ | | | | | RevBy: Mauricek AutoTest: tst_QMenuBar::check_altPress() Details: We do not allow alt navigation with the windows mobile style
* BT: Fix up comments in new Cocoa files.Norwegian Rock Cat2009-04-089-119/+163
| | | | | | It seems that Vim or Xcode or whatever I was using to paste these in messed up and added an extra space. Now we should be consistent with the .cpp files and I found a file that we missed too.
* Javascript: When there is javascript running then it will spin the CPU at 100%Bradley T. Hughes2009-04-083-3/+81
| | | | | | | | | | | | Zero timers on Windows would continue to fire even after being stopped as long as a new timer was started that reused the pointer address of the zero timer. Fix this by only re-firing zero timers if the zero timer hadn't been stopped (we can check this by looking at the inTimerEvent flag, which is set to false by registerTimer()). Task-number: 247401 Reviewed-by: Denis Dzyubenko Reviewed-by: Prasanth Ullattil
* BT: Fix infinite recursion potential from change acff913a6287ad50b0ac782Norwegian Rock Cat2009-04-081-4/+5
| | | | | | | | It seems there is a potential for recursion because calling keyDown: can bubble up to the window which will start the process all over again. keyDown: will actually call qt_dispatchKeyEvent(), we may as well short it out here. All the previous cases I tried continue to work and we don't crash Creator if you are really impatient hitting keys.
* BT: Fix the embedded dialogs demo on Mac OS X and Motif styleAndreas Aardal Hanssen2009-04-082-3/+15
| | | | | | | | | | | | | | | | | The CustomProxy class installs an event filter on its child to detect whether it is shadowed by a popup or not. The problem is it does this regardless of whether it currently has a scene assigned or not. Styles that assign palettes, or otherwise cause side effects when assigned to a QGraphicsProxyWidget, will cause the demo to print warnings to the console and fail to install the event filter. The reason for the failure to install the filter is that QGraphicsItem only allows scene event filters to be installed between items that are in the same scene. So, depending on the style, you either get an ItemSceneHasChanged or an ItemChildAddedChange first. The demo must account for this, and install its filter only when the items are guaranteed to be in the scene already. Reviewed-by: Alexis
* Revert "Bt: Fix regression in the Embedded dialogs example"Andreas Aardal Hanssen2009-04-082-22/+13
| | | | | | | | | | | | | | | | | This reverts commit 35c26d696cbff269d551c012a212c09692dd6f6b. The change to QComboBox introduces a behavior change; whereas before the view container would always get its palette set as a response to QEvent::PaletteChange, it would now miss this event and rely on regular palette propagation to get the right contens. The difference in behavior is that QWidget::setPalette() also resolves the palette mask, and after 35c26d69 this would no longer happen. The bug in the embedded dialogs demo is caused by the embedded dialogs demo. See upcoming commit. Reviewed-by: Alexis Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
* Autotest: Cisco changed their DNS setup; update our test.Thiago Macieira2009-04-081-1/+1
| | | | Reviewed-by: TrustMe
* fix assertMaurice Kalinowski2009-04-081-4/+4
| | | | | | | | | Reviewed-by: thartman - in case we explicitly use double as testdata, one cannot push float to it. - fuzzyCompare is not fuzzy enough, thus adopt the epsilon check of other testfunctions.
* remove senseless testfunctionsMaurice Kalinowski2009-04-081-17/+17
| | | | | | | | | | Reviewed-by: joerg Some of the testfunctions use key/mouse events, which doesn't work on Windows Mobile due to native menubar integration. Basically the same situation like on Mac. In addition there are still two test functions failing, waiting for input on those.
* BT: Revert "Fixes: Remove warnings in the embeddeddialogs demo."Andreas Aardal Hanssen2009-04-081-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit 7d24c0af8e52687b4e5735950495bb25947ca9f0. This change removed the accidental recursion leading to console warnings on Mac OS X by changing the way the scene event filter is registered for popups. But it also broke the behavior of the demo with regards to popup handling, in that the custom proxy no longer can detect popups that close, so dialogs stay zoomed in after the cursor has left. So before, the demo worked but printed warnings to the console on Mac OS X, and after, the warnings were gone but the demo behavior broke on all platforms... The change also accidentally removed the cache mode from the popup; I don't think this was intentional. Reviewed-by: Alexis
* New binary for Windows configureMarius Storm-Olsen2009-04-081-0/+0
| | | | | Reviewed-by: mauricek BT: yes
* Don't check license for internal configurationsMarius Storm-Olsen2009-04-081-1/+2
| | | | | | | A Nokia build doesn't require a license. Reviewed-by: mauricek BT: yes
* add deployment for WinCEMaurice Kalinowski2009-04-081-0/+1
|
* Enable test for WinCEMaurice Kalinowski2009-04-081-1/+1
| | | | While we integrate into native menubar on Windows Mobile, we can still test WinCE itself.
* DB2 driver returning double field as emptyBill King2009-04-081-1/+1
| | | | | | | | | The high precision code path was getting an empty string on the second call to getstringdata, which was causing it to return empty for the field. Really only needed to call it once anyway, so use the original call. Reviewed-by: Justin McPherson
* Missed these changes from the last commit.Bill King2009-04-081-3/+7
| | | | Last of the changes to include behaviour from QPtrVector
* Fixes: Memory leak in DB2 driverBill King2009-04-071-12/+23
| | | | | | | Looks like they were using the old QPtrVector in qt3, and didn't quite handle the porting correctly. Reviewed-by: Lincoln Ramsay
* Work around RGB32 issue in solidFillAnders Bakken2009-04-071-15/+22
| | | | | | | | | Drawing operations with DirectFB in RGB32 changes the alpha byte to 0. This doesn't play well with QRasterEngine. See 5fb7752ff93b31635e64fa321917749744cc9db6 and 34059fba55816496d2570b3306ac2b631b12a5c6 Reviewed-by: TrustMe
* Make flipflags work a little better.Anders Bakken2009-04-073-24/+41
| | | | | | | | Make it more flexible. This patch allows people to use DFB without DSFLIP_BLIT. Also, before this patch the flip= options weren't really used for anything. Reviewed-by: TrustMe
* compile with aCCOswald Buddenhagen2009-04-071-2/+2
|
* Merge branch '4.5' of git@scm.dev-nokia.troll.no:qt/qt into 4.5Thomas Hartmann2009-04-079-35/+49
|\
| * Make sure to clear surface in toImageAnders Bakken2009-04-071-1/+6
| | | | | | | | | | | | | | It seems DirectFB doesn't preserve alpha value of a blit unless BLEND is specified and if it is we need to Clear to transparent first. Reviewed-by: TrustMe
| * Fix compilation if SSL is not enabled.Thiago Macieira2009-04-071-6/+4
| | | | | | | | | | | | | | | | | | Using #ifndef QT_NO_OPENSSL without first #include'ing something will never work. Which means we always include qsslsocket.h. The problem is: if OpenSSL isn't enabled, then that file is a no-op and we never include qabstractsocket.h. Reviewed-by: Markus Goetz
| * Bt: Fix regression in the Embedded dialogs exampleJens Bache-Wiig2009-04-072-13/+22
| | | | | | | | | | | | | | | | | | | | We had to revert an earlier fix since it obviously did not work correctly. However since we do not really need to propagate the palette on the viewContainer _before_ it is created, we can simply avoid the issue alltogether as it would happen because we implicitly added a child widget during the polish of the combo box. Reviewed-by: nrc
generated by cgit v0.12 at 2025-01-04 01:05:18 (GMT)