From 157d2132c364635baec8a84d1a27b346466b546b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 23 Nov 2014 07:33:12 -0800 Subject: Remove unused functions Found by Clang 3.6: assistant/main.cpp:97:1: warning: unused function 'updateUserCollection' [-Wunused-function] Change-Id: I3fe006504e848914f38b1c481de13b3d10d1059c Reviewed-by: Christian Kandeler Reviewed-by: Friedemann Kleint --- src/assistant/assistant/main.cpp | 10 ---------- src/designer/src/lib/shared/actioneditor.cpp | 5 ----- src/designer/src/lib/shared/zoomwidget.cpp | 5 ----- 3 files changed, 20 deletions(-) diff --git a/src/assistant/assistant/main.cpp b/src/assistant/assistant/main.cpp index e4d5a4f38..6b049d3ba 100644 --- a/src/assistant/assistant/main.cpp +++ b/src/assistant/assistant/main.cpp @@ -93,16 +93,6 @@ updateLastPagesOnUnregister(QHelpEngineCore& helpEngine, const QString& nsName) } } -bool -updateUserCollection(QHelpEngineCore& user, const QHelpEngineCore& caller) -{ - TRACE_OBJ - if (!CollectionConfiguration::isNewer(caller, user)) - return false; - CollectionConfiguration::copyConfiguration(caller, user); - return true; -} - void stripNonexistingDocs(QHelpEngineCore& collection) { TRACE_OBJ diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp index 07ffee2b6..91297ebd7 100644 --- a/src/designer/src/lib/shared/actioneditor.cpp +++ b/src/designer/src/lib/shared/actioneditor.cpp @@ -474,11 +474,6 @@ void ActionEditor::slotNewAction() } } -static inline bool isSameIcon(const QIcon &i1, const QIcon &i2) -{ - return i1.cacheKey() == i2.cacheKey(); -} - // return a FormWindow command to apply an icon or a reset command in case it // is empty. diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp index aa3c3f2a7..c95bd3a30 100644 --- a/src/designer/src/lib/shared/zoomwidget.cpp +++ b/src/designer/src/lib/shared/zoomwidget.cpp @@ -55,11 +55,6 @@ enum { debugZoomWidget = 0 }; static const int menuZoomList[] = { 100, 25, 50, 75, 125, 150 , 175, 200 }; -static inline QSize qCeiling(const QSizeF &s) -{ - return QSize(qCeil(s.width()), qCeil(s.height())); -} - namespace qdesigner_internal { // ---------- ZoomMenu -- cgit v1.2.3 From c6103addf3d28f7a539c5cc78fcb69c193b9e148 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 7 Jan 2015 10:08:23 +0100 Subject: windeployqt: Update plugin directory-module associations. Change-Id: I15d030b03a759aff3c6b0a3d2eb415684e635a07 Reviewed-by: Kai Koehne Reviewed-by: Friedemann Kleint --- src/windeployqt/main.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index a1568fa5b..1b46957dc 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -712,8 +712,12 @@ static inline quint64 qtModuleForPlugin(const QString &subDirName) return QtMultimediaModule; if (subDirName == QLatin1String("printsupport")) return QtPrintSupportModule; + if (subDirName == QLatin1String("scenegraph")) + return QtQuickModule; if (subDirName == QLatin1String("qmltooling")) - return QtDeclarativeModule | QtQuickModule | QtQmlToolingModule; + return QtQuickModule | QtQmlToolingModule; + if (subDirName == QLatin1String("qml1tooling")) + return QtDeclarativeModule; if (subDirName == QLatin1String("position")) return QtPositioningModule; if (subDirName == QLatin1String("sensors") || subDirName == QLatin1String("sensorgestures")) -- cgit v1.2.3 -- cgit v1.2.3 From b89afa69be69600809c046cf0fefa7af31ad54bc Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Mon, 12 Jan 2015 14:13:17 +0100 Subject: Doc: invalid links in linguist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Corrected link to qmake, removed link to lconvert Task-number: QTBUG-43779 Change-Id: Ieb5bbc0385764bbcff1305ae4f2f2377cf43f464 Reviewed-by: Topi Reiniö --- src/linguist/linguist/doc/src/linguist-manual.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/linguist/linguist/doc/src/linguist-manual.qdoc b/src/linguist/linguist/doc/src/linguist-manual.qdoc index c0d1b07ed..c442eb211 100644 --- a/src/linguist/linguist/doc/src/linguist-manual.qdoc +++ b/src/linguist/linguist/doc/src/linguist-manual.qdoc @@ -151,7 +151,7 @@ \nextpage Qt Linguist Manual: Translators Two tools are provided for the release manager, lupdate and - lrelease. These tools can process \l qmake project files, or operate + lrelease. These tools can process \l {qmake Manual}{qmake} project files, or operate directly on the file system. \section1 Creating Translation Files @@ -972,7 +972,7 @@ However, it is not necessary to always deploy all of Qt 5's \c .qm files. We recommend concatenating the \c .qm files of the modules required to - one file matching the meta catalog file name using the tool \l lconvert in + one file matching the meta catalog file name using the tool \c lconvert in the deploy step. For example, to create a German translation file for an application using the modules \l{Qt Core}, \l {Qt GUI}, and \l {Qt Quick}, run: -- cgit v1.2.3 From d6c61e16437b5c31b73ada65471532625ae19ecc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 9 Jan 2015 21:05:56 +0100 Subject: generate_ui: make the generated code compile for uic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These includes should also work when compiled for designer. Change-Id: I1705e47f561589b0deec23dc773408835947c1fc Reviewed-by: Friedemann Kleint Reviewed-by: Jędrzej Nowacki --- src/designer/data/generate_header.xsl | 11 +++++------ src/designer/src/lib/uilib/ui4_p.h | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/designer/data/generate_header.xsl b/src/designer/data/generate_header.xsl index 579e01eae..c9a2b0afb 100644 --- a/src/designer/data/generate_header.xsl +++ b/src/designer/data/generate_header.xsl @@ -388,12 +388,11 @@ #ifndef UI4_H #define UI4_H -#include <QtCore/QList> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamWriter> -#include <QtCore/qglobal.h> +#include <qlist.h> +#include <qstring.h> +#include <qstringlist.h> +#include <qxmlstream.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/uilib/ui4_p.h b/src/designer/src/lib/uilib/ui4_p.h index 5828900bc..51a70749c 100644 --- a/src/designer/src/lib/uilib/ui4_p.h +++ b/src/designer/src/lib/uilib/ui4_p.h @@ -47,12 +47,11 @@ #ifndef UI4_H #define UI4_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include QT_BEGIN_NAMESPACE -- cgit v1.2.3