QT.clucene.bins = $$QT_MODULE_BIN_BASE
QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucene
QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/$$QT.clucene.VERSION
-QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/lib/fulltextsearch
+QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/clucene
QT.clucene.libs = $$QT_MODULE_LIB_BASE
QT.clucene.plugins = $$QT_MODULE_PLUGIN_BASE
QT.clucene.imports = $$QT_MODULE_IMPORT_BASE
QT.clucene.depends = core
+QT.clucene.defines = QT_CLUCLENE_LIB
+
+QT_CONFIG += clucene
QT.help.bins = $$QT_MODULE_BIN_BASE
QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp
QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/$$QT.help.VERSION
-QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib
+QT.help.sources = $$QT_MODULE_BASE/src/assistant/help
QT.help.libs = $$QT_MODULE_LIB_BASE
QT.help.plugins = $$QT_MODULE_PLUGIN_BASE
QT.help.imports = $$QT_MODULE_IMPORT_BASE
-QT.help.depends = network xml sql
+QT.help.depends = network sql
QT.help.DEFINES = QT_HELP_LIB
+
+QT_CONFIG += help
// It is internal CLucene header - DO NOT include it directly
#if !defined(_SUPPRESS_MAKE_BASED_CONFIG)
#if defined(_BUILD_FOR_QT_)
- #include "fulltextsearch/qclucene-config_p.h"
+ #include "qclucene-config_p.h"
#else
#include "CLucene/clucene-config.h" //make clucene-config.h file
#endif
TEMPLATE = subdirs
CONFIG += ordered
-SUBDIRS += lib/fulltextsearch \
- lib \
- tools
+SUBDIRS += clucene \
+ help \
+ assistant \
+ qhelpgenerator \
+ qcollectiongenerator \
+ qhelpconverter
+
-include(../../../shared/fontpanel/fontpanel.pri)
TEMPLATE = app
LANGUAGE = C++
TARGET = assistant
CONFIG += qt \
warn_on \
help
-QT += widgets network help
+QT += widgets printsupport network help
PROJECTNAME = Assistant
-DESTDIR = $$QT.designer.bins
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
+
DEPENDPATH += ../shared
-INCLUDEPATH += $$QT.help.includes
+
+include(../../shared/fontpanel/fontpanel.pri)
# ## Work around a qmake issue when statically linking to
# ## not-yet-installed plugins
#include <QtGui/QKeyEvent>
#include <QtWidgets/QMenu>
-#include <QtWidgets/QPageSetupDialog>
-#include <QtWidgets/QPrintDialog>
-#include <QtWidgets/QPrintPreviewDialog>
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPageSetupDialog>
+#include <QtPrintSupport/QPrintDialog>
+#include <QtPrintSupport/QPrintPreviewDialog>
+#include <QtPrintSupport/QPrinter>
#include <QtWidgets/QStackedWidget>
#include <QtWidgets/QTextBrowser>
#include <QtWidgets/QVBoxLayout>
class FindWidget;
class HelpViewer;
class QStackedWidget;
+class QPrinter;
class TabBar : public QTabBar
{
#ifndef XBELSUPPORT_H
#define XBELSUPPORT_H
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
#include <QtCore/QPersistentModelIndex>
QT_FORWARD_DECLARE_CLASS(QIODevice)
load(qt_module)
-QMAKE_TARGET_PRODUCT = QtCLucene
-QMAKE_TARGET_DESCRIPTION = QtCLucene full text search library wrapper.
-#if qt is built with frameworks in debug, we must build QtCLucene in debug and release
-#that's a similar logic as in qbase.pri
-mac:!static:contains(QT_CONFIG, qt_framework) {
- CONFIG(debug, debug|release) {
- !build_pass:CONFIG += build_all
- }
-}
-QT_CONFIG -= qt_framework
-QT -= gui
-TEMPLATE = lib
TARGET = QtCLucene
+QPRO_PWD = $$PWD
+
+CONFIG += module
+MODULE_PRI = ../../../modules/qt_clucene.pri
+
+QT = core
+
DEFINES += QHELP_LIB
-include($$QT_SOURCE_TREE/src/qbase.pri)
+load(qt_module_config)
HEADERS += qtcluceneversion.h
include(fulltextsearch.pri)
DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
-CLUCENEDIR = ../../../../3rdparty/clucene/src/CLucene
+CLUCENEDIR = ../3rdparty/clucene/src/CLucene
INCLUDEPATH += . .. \
$$CLUCENEDIR \
load(qt_module)
-QT += widgets \
- sql \
- xml \
- network \
- core-private
-TEMPLATE = lib
TARGET = QtHelp
+QPRO_PWD = $$PWD
+QT += widgets sql network core-private clucene clucene-private
CONFIG += module
MODULE_PRI += ../../../modules/qt_help.pri
-DEFINES += QHELP_LIB \
- QT_CLUCENE_SUPPORT
-CONFIG += qt \
- warn_on
-include($$QT_SOURCE_TREE/src/qbase.pri)
+DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT
+
+load(qt_module_config)
HEADERS += qthelpversion.h
-QMAKE_TARGET_PRODUCT = Help
-QMAKE_TARGET_DESCRIPTION = Help \
- application \
- framework.
DEFINES -= QT_ASCII_CAST_WARNINGS
-INCLUDEPATH += $$QT.help.includes
+
qclucene = QtCLucene$${QT_LIBINFIX}
if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
mac:qclucene = $${qclucene}_debug
win32:qclucene = $${qclucene}d
}
linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
- QtSql \
- QtXml
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtCore QtNetwork QtSql
+
LIBS_PRIVATE += -l$$qclucene
RESOURCES += helpsystem.qrc
SOURCES += qhelpenginecore.cpp \
#include <QtCore/QRegExp>
#include <QtCore/QUrl>
#include <QtCore/QVariant>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
QT_BEGIN_NAMESPACE
**
****************************************************************************/
-#include "fulltextsearch/qindexreader_p.h"
-#include "fulltextsearch/qqueryparser_p.h"
-#include "fulltextsearch/qsearchable_p.h"
+#include "private/qindexreader_p.h"
+#include "private/qqueryparser_p.h"
+#include "private/qsearchable_p.h"
#include "qclucenefieldnames_p.h"
#include "qhelpenginecore.h"
#include <QtCore/QString>
#include <QtCore/QStringList>
-#include "fulltextsearch/qanalyzer_p.h"
-#include "fulltextsearch/qquery_p.h"
+#include "private/qanalyzer_p.h"
+#include "private/qquery_p.h"
#include "qhelpsearchindexreader_p.h"
QT_BEGIN_NAMESPACE
#include "qclucenefieldnames_p.h"
#include "qhelpenginecore.h"
#include "qhelp_global.h"
-#include "fulltextsearch/qhits_p.h"
-#include "fulltextsearch/qquery_p.h"
-#include "fulltextsearch/qanalyzer_p.h"
-#include "fulltextsearch/qdocument_p.h"
-#include "fulltextsearch/qsearchable_p.h"
-#include "fulltextsearch/qindexreader_p.h"
-#include "fulltextsearch/qindexwriter_p.h"
+#include "private/qhits_p.h"
+#include "private/qquery_p.h"
+#include "private/qanalyzer_p.h"
+#include "private/qdocument_p.h"
+#include "private/qsearchable_p.h"
+#include "private/qindexreader_p.h"
+#include "private/qindexwriter_p.h"
#include "qhelpsearchindexwriter_clucene_p.h"
#include <QtCore/QDir>
//
#include "qhelpenginecore.h"
-#include "fulltextsearch/qanalyzer_p.h"
+#include "private/qanalyzer_p.h"
#include <QtCore/QUrl>
#include <QtCore/QThread>
#include <QtCore/QLocale>
#include <QtCore/QLibraryInfo>
#include <QtHelp/QHelpEngineCore>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
QT_USE_NAMESPACE
-QT += xml \
- network \
- help-private
+QT += network help-private
TEMPLATE = app
DESTDIR = $$QT.designer.bins
TARGET = qcollectiongenerator
#include <QtCore/QMap>
#include <QtCore/QSet>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
QT_BEGIN_NAMESPACE
#ifndef QHCPWRITER_H
#define QHCPWRITER_H
-#include <QtXml/QXmlStreamWriter>
+#include <QtCore/QXmlStreamWriter>
#include "adpreader.h"
QT_BEGIN_NAMESPACE
-QT += xml help
+QT += help
TEMPLATE = app
TARGET = qhelpconverter
DESTDIR = $$QT.designer.bins
#ifndef QHPWRITER_H
#define QHPWRITER_H
-#include <QtXml/QXmlStreamWriter>
+#include <QtCore/QXmlStreamWriter>
#include "filterpage.h"
QT_BEGIN_NAMESPACE
+++ /dev/null
-TEMPLATE = subdirs
-CONFIG += ordered
-
-SUBDIRS += assistant \
- qhelpgenerator \
- qcollectiongenerator \
- qhelpconverter
-
**
****************************************************************************/
-#include <QtDesigner/default_extensionfactory.h>
+#include "default_extensionfactory.h"
#include "qextensionmanager.h"
#include <qpointer.h>
#include <QtCore/qdebug.h>
#ifndef DEFAULT_EXTENSIONFACTORY_H
#define DEFAULT_EXTENSIONFACTORY_H
-#include <QtDesigner/extension_global.h>
+#include "extension_global.h"
#include <QtDesigner/extension.h>
#include <QtCore/QMap>
#ifndef QEXTENSIONMANAGER_H
#define QEXTENSIONMANAGER_H
-#include <QtDesigner/extension_global.h>
+#include "extension_global.h"
#include <QtDesigner/extension.h>
#include <QtCore/QHash>
load(qt_module)
-TEMPLATE=lib
-TARGET=QtDesigner
-QT += core-private gui-private widgets widgets-private xml uilib-private
+TARGET = QtDesigner
+QT += core-private gui-private widgets widgets-private xml uilib uilib-private
+
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-CONFIG += qt
-win32|mac: CONFIG += debug_and_release
-DESTDIR = $$QT_BUILD_TREE/lib
-!wince*:DLLDESTDIR = $$QT.designer.bins
-INCLUDEPATH += $$QT.designer.includes \
- $$QT.designer.private_includes \
- $$QT.designer.private_includes/QtDesigner
+#win32|mac: CONFIG += debug_and_release
+#DESTDIR = $$QT_BUILD_TREE/lib
+#!wince*:DLLDESTDIR = $$QT.designer.bins
-isEmpty(QT_MAJOR_VERSION) {
- VERSION=4.3.0
-} else {
- VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
+#INCLUDEPATH += $$QT.designer.includes \
+# $$QT.designer.private_includes \
+# $$QT.designer.private_includes/QtDesigner
+
+#isEmpty(QT_MAJOR_VERSION) {
+# VERSION=4.3.0
+#} else {
+# VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+#}
unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml
-include($$QT_SOURCE_TREE/src/qt_targets.pri)
+load(qt_module_config)
HEADERS += qtdesignerversion.h
-QMAKE_TARGET_PRODUCT = Designer
-QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
-
!contains(CONFIG, static) {
CONFIG += dll
DEFINES += QT_DESIGNER_STATIC
}
-#load up the headers info
-CONFIG += qt_install_headers
-#headers.pri is loaded from the last include path
-LAST_MODULE_INCLUDE=$$INCLUDEPATH
-for(include_path, INCLUDEPATH):LAST_MODULE_INCLUDE=$${include_path}
-HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri
-include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
+##headers.pri is loaded from the last include path
+#LAST_MODULE_INCLUDE=$$INCLUDEPATH
+#for(include_path, INCLUDEPATH):LAST_MODULE_INCLUDE=$${include_path}
+#HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri
+#include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
#mac frameworks
mac:CONFIG += explicitlib
include(extension/extension.pri)
include(sdk/sdk.pri)
-include($$QT_SOURCE_TREE/tools/uilib/uilib.pri)
-INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib
include(shared/shared.pri)
PRECOMPILED_HEADER=lib_pch.h
include(../sharedcomponents.pri)
include(../components/component.pri)
-target.path=$$[QT_INSTALL_LIBS]
-INSTALLS += target
-win32 {
- dlltarget.path=$$[QT_INSTALL_BINS]
- INSTALLS += dlltarget
-}
+#target.path=$$[QT_INSTALL_LIBS]
+#INSTALLS += target
+#win32 {
+# dlltarget.path=$$[QT_INSTALL_BINS]
+# INSTALLS += dlltarget
+#}
-qt_install_headers {
- designer_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
- designer_headers.path = $$[QT_INSTALL_HEADERS]/QtDesigner
- INSTALLS += designer_headers
-}
+#qt_install_headers {
+# designer_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
+# designer_headers.path = $$[QT_INSTALL_HEADERS]/QtDesigner
+# INSTALLS += designer_headers
+#}
#include "widgetfactory_p.h"
#include "qdesigner_introspection_p.h"
-#include <ui4_p.h>
+#include <private/ui4_p.h>
#include <formbuilderextra_p.h>
// sdk
#include <QtDesigner/container.h>
#include "qlayout_widget_p.h"
#include "qdesigner_introspection_p.h"
-#include <formbuilderextra_p.h>
+#include <private/formbuilderextra_p.h>
#include <QtDesigner/QDesignerFormWindowInterface>
#include <QtDesigner/QDesignerFormEditorInterface>
include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
include(../../../../shared/deviceskin/deviceskin.pri)
-include($$QT_SOURCE_TREE/src/tools/rcc/rcc.pri)
+include($$QT_MODULE_BASE/src/tools/rcc/rcc.pri)
include(../../../../shared/findwidget/findwidget.pri)
include(../../../../shared/qtgradienteditor/qtgradienteditor.pri)
pmp.end();
p.setBrushOrigin((rect.width() % pixSize + pixSize) / 2, (rect.height() % pixSize + pixSize) / 2);
- p.setClipRect(r[1].adjusted(4, 4, -4, -4));
- p.setClipRect(QRect(rect.topLeft(), QPoint(r[1].left() + 0, rect.bottom())), Qt::UniteClip);
- p.setClipRect(QRect(QPoint(r[1].right() - 0, rect.top()), rect.bottomRight()), Qt::UniteClip);
- p.setClipRect(QRect(rect.topLeft(), QPoint(rect.right(), r[1].top() + 0)), Qt::UniteClip);
- p.setClipRect(QRect(QPoint(rect.left(), r[1].bottom() - 0), rect.bottomRight()), Qt::UniteClip);
+ QRegion region = r[1].adjusted(4, 4, -4, -4);
+ region |= QRect(rect.topLeft(), QPoint(r[1].left() + 0, rect.bottom()));
+ region |= QRect(QPoint(r[1].right() - 0, rect.top()), rect.bottomRight());
+ region |= QRect(rect.topLeft(), QPoint(rect.right(), r[1].top() + 0));
+ region |= QRect(QPoint(rect.left(), r[1].bottom() - 0), rect.bottomRight());
+ p.setClipRegion(region);
/*
p.setClipRect(r[1].adjusted(3, 3, -3, -3));
p.setClipRect(QRect(rect.topLeft(), QPoint(r[1].left() + 1, rect.bottom())), Qt::UniteClip);
}
p.setBrush(m_alphalessPixmap);
if (m_orientation == Qt::Horizontal) {
- p.setClipRect(r[1].adjusted(0, qRound(r[1].height() * coef), 0, 0));
- p.setClipRect(r[1].adjusted(0, 0, 0, -qRound(r[1].height() * coef)), Qt::UniteClip);
+ QRegion region = r[1].adjusted(0, qRound(r[1].height() * coef), 0, 0);
+ region |= r[1].adjusted(0, 0, 0, -qRound(r[1].height() * coef));
+ p.setClipRegion(region);
} else {
- p.setClipRect(r[1].adjusted(qRound(r[1].width() * coef), 0, 0, 0));
- p.setClipRect(r[1].adjusted(0, 0, -qRound(r[1].width() * coef), 0), Qt::UniteClip);
+ QRegion region = r[1].adjusted(qRound(r[1].width() * coef), 0, 0, 0);
+ region |= r[1].adjusted(0, 0, -qRound(r[1].width() * coef), 0);
+ p.setClipRegion(region);
}
p.setBrush(Qt::NoBrush);
p.setPen(QPen(QColor(c.rgb())));
central.y() - d_ptr->m_radiusRadial * size().height(),
2 * d_ptr->m_radiusRadial * size().width(),
2 * d_ptr->m_radiusRadial * size().height());
- p.setClipRect(r1);
- p.setClipRect(r2, Qt::UniteClip);
- p.setClipRect(r3, Qt::UniteClip);
+ QRegion region = r1.toRect();
+ region |= r2.toRect();
+ region |= r3.toRect();
+ p.setClipRegion(region);
p.drawEllipse(rect);
if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::RadiusRadialHandle) {
p.save();
%modules = ( # path to module name map
- "QtCLucene" => "$basedir/src/assistant/lib/fulltextsearch",
- "QtHelp" => "$basedir/src/assistant/lib",
+ "QtCLucene" => "$basedir/src/assistant/clucene",
+ "QtHelp" => "$basedir/src/assistant/help",
"QtDesigner" => "$basedir/src/designer/src/lib",
);
%moduleheaders = ( # restrict the module headers to those found in relative path
"xml" => "#include <QtXml/QtXml>\n",
"network" => "#include <QtNetwork/QtNetwork>\n",
"script" => "#include <QtScript/QtScript>\n",
- "qt3support" => "#include <Qt3Support/Qt3Support>\n",
"declarative" => "#include <QtDeclarative/QtDeclarative>\n",
"clucene" => "#include <QtCLucene/QtCLucene>\n",
"help" => "#include <QtHelp/QtHelp>\n",
"QtHelp" => "$basedir/modules/qt_help.pri",
"QtDesigner" => "$basedir/modules/qt_designer.pri",
);
-# Modules and programs, and their dependencies.
-# Each of the module version specifiers can take one of the following values:
-# - A specific Git revision.
-# - "LATEST_REVISION", to always test against the latest revision.
-# - "LATEST_RELEASE", to always test against the latest public release.
-# - "THIS_REPOSITORY", to indicate that the module is in this repository.
%dependencies = (
- "QtHelp" => {
- "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtSql" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- },
- "linguist" => {
- "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtDesigner" => "THIS_REPOSITORY",
- "QtUiTools" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- },
- "designer" => {
- "QtNetwork" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtDesigner" => "THIS_REPOSITORY",
- "QtScript" => "4d15ca64fc7ca81bdadba9fbeb84d4e98a6c0edc",
- "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- },
- "assistant" => {
- "QtWebKit" => "LATEST_REVISION",
- "QtHelp" => "THIS_REPOSITORY",
- "QtNetwork" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtSql" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- },
- "QtDesigner" => {
- "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- "QtScript" => "4d15ca64fc7ca81bdadba9fbeb84d4e98a6c0edc",
- "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
- },
+ "qtbase" => "refs/heads/master",
+ "qtsvg" => "refs/heads/master",
+ "qtxmlpatterns" => "refs/heads/master",
);
projects / platform / upstream / qttools.git / commitdiff
