QtExtra代码编译
代码地址
编译环境
IDE: Microsoft Visual Studio Community 2019, 16.11.15
Qt: 5.12.5_msvc2017, 32bit
OS: Windows 10 家庭版，21H2
Qt Visual Studio Tools: 2.8.1.6
修改综述
-
构造函数使用默认参数时，不同都和默认构造函数一样
-
LONG_LONG_MIN、LONG_LONG_MAX等修改为LONGLONG_MIN、LONGLONG_MAX等，并包含intsafe.h头文件
-
QPainterPath的函数clear限制，修改为Qt5.13
-
部分导出控件类缺少宏QTWIDGETSEXTRA_EXPORT
-
例子curvedtext项目属性增加宏QT_QTPROPERTYBROWSER_IMPORT定义
代码不同之处
点击查看代码
examples/curvedtext/widget.cpp | 2 +-
examples/curvedtext/widget.h | 2 +-
examples/spinboxes/demowidget.cpp | 4 +++-
examples/widgetdelegatedemo/previewlabel.cpp | 2 +-
.../itemviews/delegates/qtvariantitemdelegate.cpp | 13 +++++++------
qtwidgetsextra/src/widgets/qtcolorgrid.h | 2 +-
qtwidgetsextra/src/widgets/qtlongspinbox.cpp | 3 ++-
qtwidgetsextra/src/widgets/qtmultiprogressdialog.h | 2 +-
qtwidgetsextra/src/widgets/qtsplashwidget.h | 21 ++++++++++++++-------
9 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/examples/curvedtext/widget.cpp b/examples/curvedtext/widget.cpp
index 5f6048c..52a76f0 100644
--- a/examples/curvedtext/widget.cpp
+++ b/examples/curvedtext/widget.cpp
@@ -89,7 +89,7 @@ void Widget::createRounderPage(QtAttributeResource* resource)
tabWidget->addTab(pageWidget, tr("Rounded Polygon"));
}
-void Widget::createStarPage(QtAttributeResource *resource)
+void Widget::createStarPage(QtAttributeResource* resource)
{
QWidget* pageWidget = new QWidget(this);
StarArea* paintArea = new StarArea(pageWidget);
diff --git a/examples/curvedtext/widget.h b/examples/curvedtext/widget.h
index 9ce3db4..43298ba 100644
--- a/examples/curvedtext/widget.h
+++ b/examples/curvedtext/widget.h
@@ -10,7 +10,7 @@
class QTabWidget;
class QPushButton;
-class QtPropertyWidget;
+//class QtPropertyWidget;
class QtAttributeResource;
class PaintArea;
diff --git a/examples/spinboxes/demowidget.cpp b/examples/spinboxes/demowidget.cpp
index 91dda33..c2a9a94 100644
--- a/examples/spinboxes/demowidget.cpp
+++ b/examples/spinboxes/demowidget.cpp
@@ -19,6 +19,8 @@
#include <QToolTip>
+#include <intsafe.h>
+
DemoWidget::DemoWidget(QWidget *parent)
: QWidget(parent)
{
@@ -35,7 +37,7 @@ DemoWidget::DemoWidget(QWidget *parent)
insertWidget(spinBox);
spinBox = new QtLongSpinBox(this);
- static_cast<QtLongSpinBox*>(spinBox)->setRange(LONG_LONG_MIN, LONG_LONG_MAX);
+ static_cast<QtLongSpinBox*>(spinBox)->setRange(LONGLONG_MIN, LONGLONG_MAX);
static_cast<QtLongSpinBox*>(spinBox)->setValue(INT_MAX);
static_cast<QtLongSpinBox*>(spinBox)->setDisplayIntegerBase(16);
insertWidget(spinBox);
diff --git a/examples/widgetdelegatedemo/previewlabel.cpp b/examples/widgetdelegatedemo/previewlabel.cpp
index fc667ed..3a798a1 100644
--- a/examples/widgetdelegatedemo/previewlabel.cpp
+++ b/examples/widgetdelegatedemo/previewlabel.cpp
@@ -26,7 +26,7 @@ public:
// update clipping mask
void updateMask(const QRect& rect)
{
-#if (QT_VERSION > QT_VERSION_CHECK(5, 9, 1))
+#if (QT_VERSION > QT_VERSION_CHECK(5, 13, 0))
maskPath.clear(); // this allows the path to reuse previous memory allocations
#else
maskPath = QPainterPath();
diff --git a/qtwidgetsextra/src/itemviews/delegates/qtvariantitemdelegate.cpp b/qtwidgetsextra/src/itemviews/delegates/qtvariantitemdelegate.cpp
index cd5a7b7..5c4b045 100644
--- a/qtwidgetsextra/src/itemviews/delegates/qtvariantitemdelegate.cpp
+++ b/qtwidgetsextra/src/itemviews/delegates/qtvariantitemdelegate.cpp
@@ -1,5 +1,6 @@
#include <climits>
#include <float.h>
+#include <intsafe.h>
#ifndef QTWIDGETSEXTRA_NO_CUSTOMEDITORS
#include "../../widgets/qtcolorbutton.h"
@@ -60,13 +61,13 @@ public:
attributeMap.insert(QVariant::UInt, Attribute("maximum", UINT_MAX));
attributeMap.insert(QVariant::ULongLong, Attribute("minimum", 0));
- attributeMap.insert(QVariant::ULongLong, Attribute("maximum", ULONG_LONG_MAX));
+ attributeMap.insert(QVariant::ULongLong, Attribute("maximum", ULONGLONG_MAX));
attributeMap.insert(QVariant::Int, Attribute("minimum", INT_MIN));
attributeMap.insert(QVariant::Int, Attribute("maximum", INT_MAX));
- attributeMap.insert(QVariant::LongLong, Attribute("minimum", LONG_LONG_MIN));
- attributeMap.insert(QVariant::LongLong, Attribute("maximum", LONG_LONG_MAX));
+ attributeMap.insert(QVariant::LongLong, Attribute("minimum", LONGLONG_MIN));
+ attributeMap.insert(QVariant::LongLong, Attribute("maximum", LONGLONG_MAX));
attributeMap.insert(QVariant::Double, Attribute("minimum", DBL_MIN));
attributeMap.insert(QVariant::Double, Attribute("maximum", DBL_MAX));
@@ -118,7 +119,7 @@ QWidget *QtVariantItemEditorFactory::createEditor(int userType, QWidget * parent
case QVariant::ULongLong:
w = new QtLongSpinBox(parent);
w->setProperty("minimum", 0);
- w->setProperty("maximum", LONG_LONG_MAX);
+ w->setProperty("maximum", LONGLONG_MAX);
break;
#else
case QVariant::ULongLong:
@@ -137,8 +138,8 @@ QWidget *QtVariantItemEditorFactory::createEditor(int userType, QWidget * parent
#ifndef QTWIDGETSEXTRA_NO_CUSTOMEDITORS
case QVariant::LongLong:
w = new QtLongSpinBox(parent);
- w->setProperty("minimum", LONG_LONG_MIN);
- w->setProperty("maximum", LONG_LONG_MAX);
+ w->setProperty("minimum", LONGLONG_MIN);
+ w->setProperty("maximum", LONGLONG_MAX);
break;
#else
case QVariant::LongLong:
diff --git a/qtwidgetsextra/src/widgets/qtcolorgrid.h b/qtwidgetsextra/src/widgets/qtcolorgrid.h
index 5f9e954..88bddcc 100644
--- a/qtwidgetsextra/src/widgets/qtcolorgrid.h
+++ b/qtwidgetsextra/src/widgets/qtcolorgrid.h
@@ -11,7 +11,7 @@
class QtColorPalette;
-class QtColorGrid :
+class QTWIDGETSEXTRA_EXPORT QtColorGrid :
public QListView
{
Q_OBJECT
diff --git a/qtwidgetsextra/src/widgets/qtlongspinbox.cpp b/qtwidgetsextra/src/widgets/qtlongspinbox.cpp
index 7da0f65..6bfeeaf 100644
--- a/qtwidgetsextra/src/widgets/qtlongspinbox.cpp
+++ b/qtwidgetsextra/src/widgets/qtlongspinbox.cpp
@@ -5,6 +5,7 @@
#include <QValidator>
#include <QApplication>
#include "qtlongspinbox.h"
+#include <intsafe.h>
/**
* \internal
@@ -81,7 +82,7 @@ QString QtLongSpinBoxPrivate::textFromValue(qlonglong value) const
str = prefix + QString::number(qAbs(value), radix);
} else {
str = q_ptr->locale().toString(value);
- if (!q_ptr->isGroupSeparatorShown() && (qAbs(value) >= 1000 || value == LONG_LONG_MAX)) {
+ if (!q_ptr->isGroupSeparatorShown() && (qAbs(value) >= 1000 || value == LONGLONG_MAX)) {
str.remove(q_ptr->locale().groupSeparator());
}
}
diff --git a/qtwidgetsextra/src/widgets/qtmultiprogressdialog.h b/qtwidgetsextra/src/widgets/qtmultiprogressdialog.h
index 48d655f..73d825c 100644
--- a/qtwidgetsextra/src/widgets/qtmultiprogressdialog.h
+++ b/qtwidgetsextra/src/widgets/qtmultiprogressdialog.h
@@ -6,7 +6,7 @@
class QAbstractButton;
-class QtMultiProgressDialog :
+class QTWIDGETSEXTRA_EXPORT QtMultiProgressDialog :
public QDialog
{
Q_OBJECT
diff --git a/qtwidgetsextra/src/widgets/qtsplashwidget.h b/qtwidgetsextra/src/widgets/qtsplashwidget.h
index 88c9460..ed5cdf3 100644
--- a/qtwidgetsextra/src/widgets/qtsplashwidget.h
+++ b/qtwidgetsextra/src/widgets/qtsplashwidget.h
@@ -10,13 +10,13 @@ class QTWIDGETSEXTRA_EXPORT QtSplashWidget :
Q_OBJECT
Q_DISABLE_COPY(QtSplashWidget)
public:
- explicit QtSplashWidget(QWidget *parent = Q_NULLPTR);
+ explicit QtSplashWidget(QWidget* parent = Q_NULLPTR);
- explicit QtSplashWidget(const QPixmap& pixmap = QPixmap(),
- const QString& title = QString(),
- const QString& copyright = QString(),
- QWidget *parent = Q_NULLPTR,
- Qt::WindowFlags f = 0);
+ explicit QtSplashWidget(QWidget* parent,
+ Qt::WindowFlags f,
+ const QPixmap& pixmap = QPixmap(),
+ const QString& title = QString(),
+ const QString& copyright = QString());
~QtSplashWidget();
posted on 2022-08-04 13:09 OctoberKey 阅读(77) 评论(0) 收藏 举报
浙公网安备 33010602011771号