Lars Knoll
6773a7f870
small fixes
2011-05-08 09:12:17 +02:00
Lars Knoll
2de87f9879
fix includes
2011-05-08 09:03:28 +02:00
Qt Continuous Integration System
cf1440a6e3
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Install private headers into the correct location
2011-05-08 13:17:33 +10:00
Marius Storm-Olsen
ab53743198
Install private headers into the correct location
...
The privates need to be under <MODULE NAME>/ since we use
#include <ModuleName/private/header_p.h>
in many places
2011-05-07 22:10:54 -05:00
Lars Knoll
a889305c7e
fix pro files
...
all examples compile again
2011-05-07 23:50:03 +02:00
Lars Knoll
e510b6e466
include fixes
...
Fixed the include statements
added QT+=widgets in examples/network to
get them to compile. Will need something better
than doing it manually.
2011-05-07 22:57:49 +02:00
Lars Knoll
9474f82f8a
QTDIR/src compiles again
2011-05-07 22:31:45 +02:00
Lars Knoll
3d30c0fb60
fix remaining includes
...
Made easy thanks to the fixqt4includes
script
2011-05-07 22:22:31 +02:00
Lars Knoll
b597565788
fix for QtWidget include
2011-05-07 22:05:51 +02:00
Lars Knoll
db3dfd03c6
small script to fix Qt4 include headers
...
The script goes through all includes of the style of
and changes them to <QtWidget/QAction>
Simply run over your source code to get most compile
errors due to classes that moved between different
Qt libraries fixed.
2011-05-07 21:52:08 +02:00
Lars Knoll
aa566e7297
some build fixes
2011-05-07 21:24:37 +02:00
Lars Knoll
7ff96330ed
get QtWidgets to link
...
some more changes, mainly exporting methods from
QtGui to get QtWidgets to link.
2011-05-07 20:56:32 +02:00
Lars Knoll
d3d078aa4b
fix class mapping
...
Many classes now live in QtWidgets.
2011-05-07 19:48:27 +02:00
Lars Knoll
94c0628d22
fix includes
2011-05-07 19:36:54 +02:00
Lars Knoll
e135c811bb
move to the right location
2011-05-07 15:04:58 +02:00
Lars Knoll
1ae5e36baf
make the new QtGui compile
2011-05-07 10:29:28 +02:00
Qt Continuous Integration System
e219892b9d
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix Makefile subtargets
2011-05-07 13:27:01 +10:00
Marius Storm-Olsen
9fe4482de1
Fix Makefile subtargets
...
Commit c04b7a55d1
broke subtargets
so every rule would just make 'first' (implicitly)
2011-05-07 03:19:51 +00:00
Lars Knoll
f67b8df3eb
library split
2011-05-07 00:02:01 +02:00
Lars Knoll
32ce4fe9e6
split up qguivariant into two files
...
Move everything that will end up in QtWidgets
into a qwidgetsvariant.cpp file. Currently
this is QIcon and QSizePolicy only.
2011-05-06 23:52:43 +02:00
Lars Knoll
7ff1d396e7
move QPalette into QtGui
...
also add QGuiApplication::palette() for the default
application palette.
2011-05-06 22:08:43 +02:00
Qt Continuous Integration System
de47cd9b66
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix QRawFont::setPixelSize() on Mac
2011-05-07 00:05:46 +10:00
Eskil Abrahamsen Blomfeldt
4135b6b323
Fix QRawFont::setPixelSize() on Mac
...
When refactoring the setPixelSize() code of QRawFont, it was broken
on Mac. To avoid making the same mistake again, I've added a simple
autotest to check that the pixel size is actually set.
Reviewed-by: Jiang Jiang
(cherry picked from commit 821b8b540af491ce60d35bd84d3c91399ecc0d16)
2011-05-06 16:00:15 +02:00
Lars Knoll
dcc2317f2b
comment out references to QDragManager for now
2011-05-06 15:28:42 +02:00
Lars Knoll
a752e52341
compile fixes
2011-05-06 15:28:42 +02:00
Samuel Rødal
72409addf2
Get rid of qt_qpa_set_cursor from QGuiApplication for now.
2011-05-06 12:45:11 +02:00
Samuel Rødal
34af023e06
Fixed qpa/windows example compilation.
2011-05-06 12:14:23 +02:00
Samuel Rødal
f9442d7c51
Fixed compilation of Wayland plugin.
2011-05-06 12:12:00 +02:00
Qt Continuous Integration System
629428a3c2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
qmake vc(x)proj generator: support x64 Qt builds
qmake: remove dead code from VcxprojGenerator
2011-05-06 19:53:21 +10:00
Joerg Bornemann
61e6639c82
qmake vc(x)proj generator: support x64 Qt builds
...
Task-number: QTBUG-17911
Reviewed-by: ossi
2011-05-06 11:50:15 +02:00
Joerg Bornemann
c6fc5395ad
qmake: remove dead code from VcxprojGenerator
...
Reviewed-by: ossi
2011-05-06 11:50:03 +02:00
Qt Continuous Integration System
f15c1fff3f
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix QPainter::drawGlyphs() with non-affine transformation
2011-05-06 19:00:01 +10:00
Samuel Rødal
acf56efdc7
Get rid of stale QWidget-stuff from QGuiApplication.
2011-05-06 10:56:32 +02:00
Samuel Rødal
610aca97f6
Remove some OpenVG left-overs.
2011-05-06 10:55:25 +02:00
Eskil Abrahamsen Blomfeldt
80a230e221
Fix QPainter::drawGlyphs() with non-affine transformation
...
When the matrix has an non-affine transformation, the text will have to
be rendered using the default path-renderer. This means going through
the drawTextItem() path (since drawStaticText() has no support for those
transformations) and it also means not pre-transforming the coordinates,
since the default implementation of drawTextItem() supports
transformations.
Task-number: QTBUG-18214
Reviewed-by: Jiang Jiang
(cherry picked from commit 55446d104db77fc7994ab12352b1c08bb7b63346)
2011-05-06 10:44:49 +02:00
Qt Continuous Integration System
33558a886d
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: (26 commits)
QSslConfiguration documentation fix
HTTP auto tests: do not load resources from cache that must be revalidtd
HTTP cache backend: do not load resources that must be revalidated
HTTP reply: do not load resources from cache that must be revalidated
QNetworkCookie: allow spaces in unquoted values
QNAM HTTP: Removes some comments
QNAM HTTP: More comments
QNAM HTTP: Implement abort() and close()
QNAM HTTP: Comments
QNAM: Function re-ordering
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
HTTP caching documentation: add some comments
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
QNAM: Fix initialization order warnings
QNAM: TODO comments for Qt 5
QNAM HTTP: Fix upload progress signal
HTTP caching internals: fix logic for PreferNetwork and PreferCache
HTTP Network Reply Impl: return earlier when resource loaded from cache
HTTP Reply implementation: make cache validation method return bool
cache: rename validateCache() to loadFromCacheIfAllowed()
...
2011-05-06 18:41:31 +10:00
Qt Continuous Integration System
cede1c9626
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
QtUiTools: Remove Q3Support.
2011-05-06 17:55:35 +10:00
Olivier Goffart
3a76f74e88
Merge remote-tracking branch 'mainline/master' into earth
2011-05-06 09:54:24 +02:00
Qt Continuous Integration System
7a22950819
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
uic: Remove Q3Support.
2011-05-06 17:35:50 +10:00
Friedemann Kleint
69c4b97be2
QtUiTools: Remove Q3Support.
...
Remove special handling of Q3ButtonGroup in form builder.
2011-05-06 09:33:45 +02:00
Friedemann Kleint
ec88a76127
uic: Remove Q3Support.
...
Remove code and tests.
2011-05-06 09:32:09 +02:00
Qt Continuous Integration System
bedc018370
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Dont do doneCurrent in swapBuffers
2011-05-06 04:21:17 +10:00
Jørgen Lind
1edc451057
Dont do doneCurrent in swapBuffers
2011-05-05 18:11:57 +02:00
Qt Continuous Integration System
8663200eb0
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Changelog: Qt Designer 4.8
2011-05-06 00:27:25 +10:00
Friedemann Kleint
0df9ee335c
Changelog: Qt Designer 4.8
...
(cherry picked from commit 3a10cfc583f30be4dd98e1fcc3463c3d8bc14f31)
2011-05-05 16:17:50 +02:00
Qt Continuous Integration System
bf19972116
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
...
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
compile openvg with private headers
2011-05-06 00:09:02 +10:00
Marius Storm-Olsen
022a528dfd
compile openvg with private headers
2011-05-05 08:58:59 -05:00
Lars Knoll
41db1f3cb6
compile fixes
2011-05-05 15:56:15 +02:00
Lars Knoll
14a322318d
compile fixes
2011-05-05 15:38:01 +02:00
Lars Knoll
3821d92366
remove qwidget dependencies from keymapper
...
Remove the QWidget dependencies from keymapper and
move it back into guikernel.
2011-05-05 14:58:04 +02:00