From 6ee65dc4785b9f38cfd7405a5535c88feb3a0ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Thu, 9 Jun 2011 15:56:55 +0200 Subject: QtPlatformSupport: A helper library for platform plugins QtPlatformSupport is a static library. Platform plugins are meant to link against this library to pull in dependencies such as fontengines and convenience functions for finding the right GL configs. The linker will only pull in the symbols used, so the size of the library doesn't really matter --- src/platformsupport/platformsupport.pro | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/platformsupport/platformsupport.pro (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro new file mode 100644 index 0000000000..33b651a73f --- /dev/null +++ b/src/platformsupport/platformsupport.pro @@ -0,0 +1,23 @@ +TARGET = QtPlatformSupport +QPRO_PWD = $$PWD +QT += core-private gui-private + +CONFIG += module staticlib +MODULE_PRI = ../modules/qt_platformssupport.pri + +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui + +include(../qbase.pri) + +HEADERS += $$QT_SOURCE_TREE/src/platforms_libs/qtplatformslibsversion.h + +DEFINES += QT_NO_CAST_FROM_ASCII +PRECOMPILED_HEADER = ../corelib/global/qt_pch.h + +include(dnd/dnd.pri) +include(eglconvenience/eglconvenience.pri) +include(fb_base/fb_base.pri) +include(fontdatabases/fontdatabases.pri) +include(glxconvenience/glxconvenience.pri) +include(printersupport/printersupport.pri) + -- cgit v1.2.3 From dfd07cb247e37ded7ba9b69912b7179774b00b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Fri, 10 Jun 2011 10:04:35 +0200 Subject: Fix versionheader name for QtPlatformSupport --- src/platformsupport/platformsupport.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 33b651a73f..20052e86aa 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -9,7 +9,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui include(../qbase.pri) -HEADERS += $$QT_SOURCE_TREE/src/platforms_libs/qtplatformslibsversion.h +HEADERS += $$PWD/qtplatformsupportversion.h DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h -- cgit v1.2.3 From 85a992a3f802cf2ac39fad905c74b85af2c7c48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Fri, 10 Jun 2011 13:26:36 +0200 Subject: Compile fix, and remove warnings --- src/platformsupport/platformsupport.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 20052e86aa..5e1cc6a909 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -1,3 +1,4 @@ +load(qt_module) TARGET = QtPlatformSupport QPRO_PWD = $$PWD QT += core-private gui-private -- cgit v1.2.3 From 83130d791dafaa437486fe740b8fcd18ee82e3c8 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Mon, 20 Jun 2011 11:57:23 +0200 Subject: Mac: build fix. Make sure Platformsupport builds as a static lib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...and not as an .app, as It did. Rev-By: Jørgen Lind --- src/platformsupport/platformsupport.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 5e1cc6a909..fecf405975 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -2,6 +2,7 @@ load(qt_module) TARGET = QtPlatformSupport QPRO_PWD = $$PWD QT += core-private gui-private +TEMPLATE = lib CONFIG += module staticlib MODULE_PRI = ../modules/qt_platformssupport.pri -- cgit v1.2.3 From 1ed22cdfd3ee2181584957d7ef02c0372065699e Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Mon, 20 Jun 2011 13:20:49 +0200 Subject: Mac: buildfix for QtPlatformsupport --- src/platformsupport/platformsupport.pro | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index fecf405975..8bd931d53a 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -1,8 +1,9 @@ load(qt_module) -TARGET = QtPlatformSupport +TARGET = $$qtLibraryTarget(QtPlatformSupport) QPRO_PWD = $$PWD QT += core-private gui-private -TEMPLATE = lib +TEMPLATE = lib +DESTDIR = $$QMAKE_LIBDIR_QT CONFIG += module staticlib MODULE_PRI = ../modules/qt_platformssupport.pri -- cgit v1.2.3 From 2e94bef1e4be9ac25f2bb47da3f359d044a152a7 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Tue, 21 Jun 2011 09:47:30 +0200 Subject: Compile fix for platformsupport on Mac. Switch platformsupport over to be a shared library, which is well supported by the build system. This requires exporting classes we use. I've done this on OS_MAC only for now. Reverts 4581a9999e12e14bbf0836d0740191ba50109540 --- src/platformsupport/platformsupport.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 8bd931d53a..e808cbd404 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -5,7 +5,10 @@ QT += core-private gui-private TEMPLATE = lib DESTDIR = $$QMAKE_LIBDIR_QT -CONFIG += module staticlib +CONFIG += module +!mac:CONFIG += staticlib +mac:LIBS+=-lz + MODULE_PRI = ../modules/qt_platformssupport.pri unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -- cgit v1.2.3 From 4efaf305f51d09e214645a18a7bfa62bc36e2c61 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Tue, 21 Jun 2011 13:40:57 +0200 Subject: Add lighthouse event dispatcher API. Platform plugin creation is now moved forward in order to have a platform plugin instance at event dispatcher creation time. Plugins are now responsible for implementing PlatformIntegration::createEventDispatcher and returning an QAbstractEventDispatcher subclass. --- src/platformsupport/platformsupport.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index e808cbd404..d51ffaa751 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -7,7 +7,7 @@ DESTDIR = $$QMAKE_LIBDIR_QT CONFIG += module !mac:CONFIG += staticlib -mac:LIBS+=-lz +mac:LIBS += -lz -framework CoreFoundation -framework Carbon MODULE_PRI = ../modules/qt_platformssupport.pri @@ -22,6 +22,7 @@ PRECOMPILED_HEADER = ../corelib/global/qt_pch.h include(dnd/dnd.pri) include(eglconvenience/eglconvenience.pri) +include(eventdispatchers/eventdispatchers.pri) include(fb_base/fb_base.pri) include(fontdatabases/fontdatabases.pri) include(glxconvenience/glxconvenience.pri) -- cgit v1.2.3 From e1293b49e3adbcff8eade91dc64901d40aeb5099 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 21 Jun 2011 15:41:09 +0200 Subject: add a platform interface for input method support add QPlatformInputContext to help supporting complex text input. Communication with the focus objects/widgets will happen slightly different then before, through events instead of methods one can query on QWidget. --- src/platformsupport/platformsupport.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index d51ffaa751..ed6c408316 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -27,4 +27,4 @@ include(fb_base/fb_base.pri) include(fontdatabases/fontdatabases.pri) include(glxconvenience/glxconvenience.pri) include(printersupport/printersupport.pri) - +#include(inputmethods/inputmethods.pri) -- cgit v1.2.3 From 80eb461360eb39657ac21ce8070c02f071884e9a Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 22 Jun 2011 10:01:14 +0200 Subject: ibus IM support for the xcb backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test code to check input methods using the ibus backend used on e.g. ubuntu. The IM code is not very sophisticated, but enough to test that things are working. Reviewed-by: Jørgen Lind --- src/platformsupport/platformsupport.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index ed6c408316..0f83a8e152 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -27,4 +27,4 @@ include(fb_base/fb_base.pri) include(fontdatabases/fontdatabases.pri) include(glxconvenience/glxconvenience.pri) include(printersupport/printersupport.pri) -#include(inputmethods/inputmethods.pri) +include(inputmethods/inputmethods.pri) -- cgit v1.2.3 From 0058f00b64268f87a33466646513f7a527beeecc Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Mon, 27 Jun 2011 13:17:52 +0200 Subject: Factor out CGL code for reuse in wayland. --- src/platformsupport/platformsupport.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 0f83a8e152..5609996d8d 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -20,6 +20,7 @@ HEADERS += $$PWD/qtplatformsupportversion.h DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h +include(cglconvenience/cglconvenience.pri) include(dnd/dnd.pri) include(eglconvenience/eglconvenience.pri) include(eventdispatchers/eventdispatchers.pri) -- cgit v1.2.3 From d34b0eb633d142fc58f4aaf93afef6516acb9314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Thu, 11 Aug 2011 15:13:48 +0200 Subject: Fix platformsupport as installable module Change-Id: I17c4723c551c1cee9c442e8d6c1289bccf505d3d Reviewed-on: http://codereview.qt.nokia.com/2868 Reviewed-by: Qt Sanity Bot Reviewed-by: Andy Nichols --- src/platformsupport/platformsupport.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 5609996d8d..f5e62ef925 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -1,5 +1,5 @@ load(qt_module) -TARGET = $$qtLibraryTarget(QtPlatformSupport) +TARGET = QtPlatformSupport QPRO_PWD = $$PWD QT += core-private gui-private TEMPLATE = lib @@ -9,7 +9,9 @@ CONFIG += module !mac:CONFIG += staticlib mac:LIBS += -lz -framework CoreFoundation -framework Carbon -MODULE_PRI = ../modules/qt_platformssupport.pri +MODULE_PRI = ../modules/qt_platformsupport.pri + +load(qt_module_config) unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -- cgit v1.2.3 From ceed409b40fd5b8fe5c62ac33144e66f50b28ede Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Wed, 24 Aug 2011 09:47:20 +0200 Subject: Mac: make platformsupport a static lib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "force framework/no-framework" logic does not really work, since Qt is now a mix of frameworks and statics libs. Remove this code path and use the "detection" path instead. Also remove the exports from platformsupport. Change-Id: I0a308666480445eb47c4f443ff7529addecad10d Reviewed-on: http://codereview.qt.nokia.com/3464 Reviewed-by: Qt Sanity Bot Reviewed-by: Richard Moe Gustavsen Reviewed-by: Morten Johan Sørvig --- src/platformsupport/platformsupport.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index f5e62ef925..126cff823a 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -6,7 +6,7 @@ TEMPLATE = lib DESTDIR = $$QMAKE_LIBDIR_QT CONFIG += module -!mac:CONFIG += staticlib +CONFIG += staticlib mac:LIBS += -lz -framework CoreFoundation -framework Carbon MODULE_PRI = ../modules/qt_platformsupport.pri -- cgit v1.2.3 From 8be11227100498d7098eb7f39bbbe1e7ac6b01cf Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Thu, 8 Sep 2011 17:22:55 +0300 Subject: Add plugin mechanism to load platform input contexts Change-Id: I6e74fd395325445420efce4adf13e89abe8177ee Reviewed-on: http://codereview.qt-project.org/4482 Reviewed-by: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/platformsupport/platformsupport.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 126cff823a..9d6f8dcd41 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -30,4 +30,4 @@ include(fb_base/fb_base.pri) include(fontdatabases/fontdatabases.pri) include(glxconvenience/glxconvenience.pri) include(printersupport/printersupport.pri) -include(inputmethods/inputmethods.pri) +include(inputcontext/inputcontext.pri) -- cgit v1.2.3