diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-16 18:05:00 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-16 18:05:00 +0100 |
| commit | e8efb8f55d9ef0f1cfbbf6c50a71a3aada017f78 (patch) | |
| tree | c2b07c643f0c35236b1a9724bf5cf83e4b52afdf /src/designer | |
| parent | 1f2bed2bc8ce2c865b79c4948fba100b748c8bcb (diff) | |
| parent | d6c61e16437b5c31b73ada65471532625ae19ecc (diff) | |
Merge 5.4 into 5.4.1v5.4.1
Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a
Diffstat (limited to 'src/designer')
| -rw-r--r-- | src/designer/data/generate_header.xsl | 11 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/actioneditor.cpp | 5 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/zoomwidget.cpp | 5 | ||||
| -rw-r--r-- | src/designer/src/lib/uilib/ui4_p.h | 11 |
4 files changed, 10 insertions, 22 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/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 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 <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 |