From 876f53921d377a9216b8c922db670dbbab693eee Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 24 Oct 2013 17:19:03 +0200 Subject: Build installers with accessibility plugin This change makes the installers work with screen readers. Task-number: QTBUG-34296 Change-Id: I87cf313657d9eaa31f4cd89729b4e298880ae99e Reviewed-by: Frederik Gladhorn Reviewed-by: Karsten Heimrich --- INSTALL | 4 ++-- doc/installerfw-getting-started.qdoc | 4 ++-- installerfw.pri | 4 ++-- src/libs/installer/init.cpp | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 3922b396f..e9e65cb46 100644 --- a/INSTALL +++ b/INSTALL @@ -53,13 +53,13 @@ Adjust the qmake.conf to have a real stand alone working installer: Recommended configure options for Microsoft Windows: -configure.exe -opensource -release -static -no-multimedia -no-declarative -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -nomake examples -nomake demos +configure.exe -opensource -release -static -accessibility -no-multimedia -no-declarative -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -nomake examples -nomake demos ### Linux & Mac OS X Recommended configure options for Linux and Mac OS X: -configure -opensource -release -static -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -no-svg -nomake examples -nomake demos +configure -opensource -release -static -accessibility -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -no-svg -nomake examples -nomake demos Build the Framework diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index 1b21ac664..67dd4de14 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -81,7 +81,7 @@ Windows: \code - configure.exe -opensource -release -static -no-multimedia -no-declarative -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -nomake examples -nomake demos + configure.exe -opensource -release -static -accessibility -no-multimedia -no-declarative -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -nomake examples -nomake demos \endcode \section2 Configuring Qt for Linux and Mac OS X @@ -90,7 +90,7 @@ Mac OS X: \code - configure -opensource -release -static -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -no-svg -nomake examples -nomake demos + configure -opensource -release -static -accessibility -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -no-svg -nomake examples -nomake demos \endcode \section1 Setting up Qt Installer Framework diff --git a/installerfw.pri b/installerfw.pri index 62a82b6d9..550fc0c6c 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -87,14 +87,14 @@ macx:LIBS += -framework Carbon -framework Security isEqual(QT_MAJOR_VERSION, 4) { CONFIG += uitools CONFIG(static, static|shared) { - QTPLUGIN += qico + QTPLUGIN += qico qtaccessiblewidgets DEFINES += QT_STATIC QT += script network xml } } else { QT += uitools core-private CONFIG(static, static|shared) { - QTPLUGIN += qico + QTPLUGIN += qico qtaccessiblewidgets QT += concurrent network script xml } } diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index 9ef72b4dd..175ac98d5 100644 --- a/src/libs/installer/init.cpp +++ b/src/libs/installer/init.cpp @@ -139,9 +139,12 @@ static void initResources() { Q_INIT_RESOURCE(patch_file_lists); Q_INIT_RESOURCE(installer); + // Qt5 or better qmake generates that automatically, so this is only needed on Qt4 # if QT_VERSION < 0x050000 Q_IMPORT_PLUGIN(qico) Q_UNUSED(qt_plugin_instance_qico()); + Q_IMPORT_PLUGIN(qtaccessiblewidgets) + Q_UNUSED(qt_plugin_instance_qtaccessiblewidgets()); # endif } #endif -- cgit v1.2.3