Commit Graph

52172 Commits

Author SHA1 Message Date
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
Lars Knoll
419ef5f126 move gesture event into qgesture.*
Since QGesture stays in QtWidgets for now, move
the event there as well.
2011-05-05 14:51:04 +02:00
Lars Knoll
73a99f3897 compile fixes 2011-05-05 14:19:52 +02:00
Taito Silvola
c3ad797d8a QSslConfiguration documentation fix
setPeerVerifyMode() and peerVerifyMode() comments fix

Merge-request: 1220
Reviewed-by: Peter Hartmann
2011-05-05 14:16:30 +02:00
Lars Knoll
2bcd79e213 remove some more qapp dependencies 2011-05-05 14:07:23 +02:00
Qt Continuous Integration System
c8cd071d40 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove misspelled comment in tst_qtextdocument.cpp
2011-05-05 22:02:54 +10:00
Lars Knoll
288d388496 special directory for stuff we want to move from widgets to gui
Create a special to_be_moved directory, that will contain files
that are to be moved from QtWidgets to QtGui. This will allow
us to do a first split of the libraries rather fast and we can
then start pulling in these classes one by one.
2011-05-05 14:02:45 +02:00
Qt Continuous Integration System
948d5f22c3 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Only enable design metrics for scalable fonts
  Add a way to retrieve CTFontRef from QFont
2011-05-05 21:42:44 +10:00
Jiang Jiang
1daf67042d Only enable design metrics for scalable fonts
Bitmap fonts don't have linear advance at all.

Reviewed-by: Eskil
(cherry picked from commit 111accbf9aaf95b052448ecb70937c61e9b59d66)
2011-05-05 13:39:11 +02:00
Jiang Jiang
05a1416be8 Add a way to retrieve CTFontRef from QFont
Since macFontID restricts to quint32, we have to return that in
QFont::handle.

Task-number: QTBUG-17890
Reviewed-by: Eskil
(cherry picked from commit c8f299b7e675c839b16d750cd2633a57cdd0526f)
2011-05-05 13:39:05 +02:00
Eskil Abrahamsen Blomfeldt
45b80f054f Remove misspelled comment in tst_qtextdocument.cpp
The comment was copy-pasted, spelling error and all, from the example
in the bug report, and really doesn't make any sense at all in this
context.

Reviewed-by: TrustMe
(cherry picked from commit 7ac511d8d906575dff1a02361e31251b244d3b3a)
2011-05-05 13:38:13 +02:00
Lars Knoll
326bd84c84 move some more files into proper places 2011-05-05 12:23:13 +02:00
Lars Knoll
b220fcb1a8 remove some dependencies to QTextEdit
QSyntaxHighlighter is now free of dependencies to
QtWidgets.
QTextImageHandler still needs some work to get
the url resolving to work again.
2011-05-05 10:38:43 +02:00
Lars Knoll
7351a43560 remove some QApplication dependencies 2011-05-05 10:38:15 +02:00
Lars Knoll
22a6540326 QPixmapFilter will live in QtWidgets
The class is only used for QGraphicsEffect. When merging
QtOpenGL into Gui and Widgets, the GL nased pixmap
filters will also need to be moved into effects/ and
the pixmapFilter() method in QPaintEngineEx can get
removed.
2011-05-05 09:57:00 +02:00
Lars Knoll
4ece3fc24e remove OpenVG support
Qt5 will require OpenGL, so there's no need for
supporting OpenVG anymore.
2011-05-05 09:57:00 +02:00
Qt Continuous Integration System
fad9bc1506 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (46 commits)
  Add Q_UNIMPLEMENTED() macro
  Fix build error on Mac
  Build fix
  BC cleanup in uitools.
  Fix framework absolute path issue
  Remove QFontEngineFT::loadGlyphMetrics
  Add required font metrics functions to QRawFont
  Include pixel size of font in exported HTML from QTextDocument
  Make it possible for animation driver to specify the advance time delta
  Compile on Windows
  Remove warnings
  Fix Wayland plugin so it works with the wayland bind api
  wayland: Track wayland changes
  Support GL ES 2 with uikit.
  Lighthouse: Fix virtual desktopwidget
  Support gamma correction of text on GL
  Added .tag file with Git revision.
  new configure.exe binary
  qmake nmake generator: pass MAKEFLAGS to sub-make calls
  Move private headers into versioned subdirectory
  ...
2011-05-05 10:34:08 +10:00
Kent Hansen
1a2345ec19 Add Q_UNIMPLEMENTED() macro
(cherry picked from commit adce00979c30cc22d26ba43c15e0c7a3733b57ab)
2011-05-04 18:15:53 +02:00
Prasanth Ullattil
af026f6fa4 Fix build error on Mac
To use the private headers, the .pro file should contain
QT += <module>-private

Reviewed-by: Olivier Goffart
2011-05-04 18:04:40 +02:00
Samuel Rødal
5c2282ffa3 XCB plugin compile fix. 2011-05-04 17:01:57 +02:00
Samuel Rødal
6229ef2dce Get rid of more QWidget / QApplication dependencies. 2011-05-04 16:59:33 +02:00
Paul Olav Tvete
3611f82975 Build fix 2011-05-04 16:55:48 +02:00
Lars Knoll
d7b91f613d remove QWidget dependencies. 2011-05-04 16:39:05 +02:00
Friedemann Kleint
10a0cc3da2 BC cleanup in uitools.
Remove virtual functions obsoleted by new resource handling
in Qt Designer 4.4. Remove static hash of private objects
for formbuilder.
Requires fd61c9b24d27452df3eb478a81d7e7725fe6f5b4 in qttools.

Rubber-stamped-by: axis
2011-05-04 16:23:51 +02:00
Jiang Jiang
89cf89c51d Fix framework absolute path issue
module.prf incorrectly overwrites INSTALLS which results the absolute
soname not prepended.

Reviewed-by: Marius Storm-Olsen
2011-05-04 15:55:51 +02:00
Lars Knoll
b22f3a086e separate QPrinter and QPrintDialog
Removed all dependencies QPrinter had on QPrintDialog.
2011-05-04 15:53:52 +02:00
Samuel Rødal
7196329d32 More QApplication prefixes changed. 2011-05-04 15:13:47 +02:00
Lars Knoll
08ba97f653 qdrawutil is for QtWidgets
the methods don't make sense for QML based apps
2011-05-04 15:15:21 +02:00
Samuel Rødal
aa20a95f59 Use base-class prefix instead of QApplication:: where possible. 2011-05-04 15:03:45 +02:00
Samuel Rødal
7a0ae98978 Move some cursor handling to QGuiApplication from QApplication. 2011-05-04 14:58:26 +02:00
Lars Knoll
8c626b7079 that signal has moved to QGuiApplication 2011-05-04 14:58:52 +02:00
Lars Knoll
fd84bc720a remove some unused code
QPaintDeviceRedirection is not being used any more.
Remove all code related to it.
2011-05-04 14:55:11 +02:00
Lars Knoll
100e074126 QStylePainter belongs in QtWidgets
Move it into the styles/ directory that will end up
in the QtWidgets library
2011-05-04 14:55:11 +02:00
Samuel Rødal
5c16bb8a12 Move KeyPlatform and currentPlatform() to QGuiApplicationPrivate. 2011-05-04 14:42:42 +02:00
Samuel Rødal
e6af684ee4 Closing of popups in QWidgetWindow. 2011-05-04 14:35:36 +02:00
Samuel Rødal
4cc4cb3c51 Remove unused variable. 2011-05-04 14:35:36 +02:00
Lars Knoll
bd8d12b7f6 move platform specific files out of the way
Keep the files as reference to implement the
lighthouse plugins, but move them away from
the main directory hierachy as they won't be
part of Qt5 in any case.
2011-05-04 14:39:19 +02:00