summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/guikernel/qclipboard.cpp2
-rw-r--r--src/gui/guikernel/qclipboard_qpa.cpp2
-rw-r--r--src/gui/guikernel/qevent.cpp3
-rw-r--r--src/gui/guikernel/qeventdispatcher_glib_qpa.cpp5
-rw-r--r--src/gui/guikernel/qgenericpluginfactory_qpa.cpp2
-rw-r--r--src/gui/guikernel/qkeysequence.cpp25
-rw-r--r--src/gui/guikernel/qplatformintegrationfactory_qpa.cpp2
-rw-r--r--src/gui/guikernel/qsessionmanager_qpa.cpp2
-rw-r--r--src/gui/text/text.pri9
9 files changed, 20 insertions, 32 deletions
diff --git a/src/gui/guikernel/qclipboard.cpp b/src/gui/guikernel/qclipboard.cpp
index 5ff47bd136..83d1c9183a 100644
--- a/src/gui/guikernel/qclipboard.cpp
+++ b/src/gui/guikernel/qclipboard.cpp
@@ -43,8 +43,6 @@
#ifndef QT_NO_CLIPBOARD
-#include "qapplication.h"
-#include "private/qapplication_p.h"
#include "qpixmap.h"
#include "qclipboard_p.h"
#include "qvariant.h"
diff --git a/src/gui/guikernel/qclipboard_qpa.cpp b/src/gui/guikernel/qclipboard_qpa.cpp
index 89c0afa22d..6aa7c1d6d9 100644
--- a/src/gui/guikernel/qclipboard_qpa.cpp
+++ b/src/gui/guikernel/qclipboard_qpa.cpp
@@ -44,7 +44,7 @@
#ifndef QT_NO_CLIPBOARD
#include "qmimedata.h"
-#include "private/qapplication_p.h"
+#include "private/qguiapplication_p.h"
#include "qplatformclipboard_qpa.h"
QT_BEGIN_NAMESPACE
diff --git a/src/gui/guikernel/qevent.cpp b/src/gui/guikernel/qevent.cpp
index 4417749689..1396f1db61 100644
--- a/src/gui/guikernel/qevent.cpp
+++ b/src/gui/guikernel/qevent.cpp
@@ -41,7 +41,6 @@
#include "qevent.h"
#include "qcursor.h"
-#include "qapplication.h"
#include "private/qguiapplication_p.h"
#include "private/qevent_p.h"
#include "private/qkeysequence_p.h"
@@ -49,7 +48,7 @@
#include "qgraphicsview.h"
#include "qdebug.h"
#include "qmime.h"
-#include "qdnd_p.h"
+#include "private/qdnd_p.h"
#include "qevent_p.h"
#include "qgesture.h"
#include "private/qgesture_p.h"
diff --git a/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp b/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp
index c63314c889..b601e89bd7 100644
--- a/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp
+++ b/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp
@@ -41,13 +41,12 @@
#include "qeventdispatcher_glib_qpa_p.h"
-#include "qapplication.h"
+#include "qguiapplication.h"
#include "qplatformdefs.h"
-#include "qapplication.h"
#include <glib.h>
-#include "private/qapplication_p.h"
+#include "private/qguiapplication_p.h"
#include <qdebug.h>
diff --git a/src/gui/guikernel/qgenericpluginfactory_qpa.cpp b/src/gui/guikernel/qgenericpluginfactory_qpa.cpp
index abc575ae86..2f74747428 100644
--- a/src/gui/guikernel/qgenericpluginfactory_qpa.cpp
+++ b/src/gui/guikernel/qgenericpluginfactory_qpa.cpp
@@ -41,7 +41,7 @@
#include "qgenericpluginfactory_qpa.h"
-#include "qapplication.h"
+#include "qguiapplication.h"
#include "private/qfactoryloader_p.h"
#include "qgenericplugin_qpa.h"
#include "qdebug.h"
diff --git a/src/gui/guikernel/qkeysequence.cpp b/src/gui/guikernel/qkeysequence.cpp
index 062b1bc24d..71661438e1 100644
--- a/src/gui/guikernel/qkeysequence.cpp
+++ b/src/gui/guikernel/qkeysequence.cpp
@@ -45,7 +45,6 @@
#ifndef QT_NO_SHORTCUT
-#include "qshortcut.h"
#include "qdebug.h"
#ifndef QT_NO_REGEXP
# include "qregexp.h"
@@ -1234,10 +1233,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
QList<QModifKeyName> modifs;
if (nativeText) {
- modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
- << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
- << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
- << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
+ modifs << QModifKeyName(Qt::CTRL, QCoreApplication::translate("QShortcut", "Ctrl").toLower().append(QLatin1Char('+')))
+ << QModifKeyName(Qt::SHIFT, QCoreApplication::translate("QShortcut", "Shift").toLower().append(QLatin1Char('+')))
+ << QModifKeyName(Qt::ALT, QCoreApplication::translate("QShortcut", "Alt").toLower().append(QLatin1Char('+')))
+ << QModifKeyName(Qt::META, QCoreApplication::translate("QShortcut", "Meta").toLower().append(QLatin1Char('+')));
}
modifs += *gmodifs; // Test non-translated ones last
@@ -1299,7 +1298,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
++tran;
for (int i = 0; keyname[i].name; ++i) {
QString keyName(tran == 0
- ? QShortcut::tr(keyname[i].name)
+ ? QCoreApplication::translate("QShortcut", keyname[i].name)
: QString::fromLatin1(keyname[i].name));
if (accel == keyName.toLower()) {
ret |= keyname[i].key;
@@ -1327,7 +1326,7 @@ QString QKeySequence::encodeString(int key)
static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
{
if (!str.isEmpty())
- str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
+ str += (format == QKeySequence::NativeText) ? QCoreApplication::translate("QShortcut", "+")
: QString::fromLatin1("+");
str += theKey;
}
@@ -1367,13 +1366,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
{
// On other systems the order is Meta, Control, Alt, Shift
if ((key & Qt::META) == Qt::META)
- s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
+ s = nativeText ? QCoreApplication::translate("QShortcut", "Meta") : QString::fromLatin1("Meta");
if ((key & Qt::CTRL) == Qt::CTRL)
- addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
+ addKey(s, nativeText ? QCoreApplication::translate("QShortcut", "Ctrl") : QString::fromLatin1("Ctrl"), format);
if ((key & Qt::ALT) == Qt::ALT)
- addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
+ addKey(s, nativeText ? QCoreApplication::translate("QShortcut", "Alt") : QString::fromLatin1("Alt"), format);
if ((key & Qt::SHIFT) == Qt::SHIFT)
- addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
+ addKey(s, nativeText ? QCoreApplication::translate("QShortcut", "Shift") : QString::fromLatin1("Shift"), format);
}
@@ -1388,7 +1387,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
p += QChar((key-0x10000)%400+0xdc00);
}
} else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
- p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
+ p = nativeText ? QCoreApplication::translate("QShortcut", "F%1").arg(key - Qt::Key_F1 + 1)
: QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
} else if (key) {
int i=0;
@@ -1407,7 +1406,7 @@ NonSymbol:
#endif
while (keyname[i].name) {
if (key == keyname[i].key) {
- p = nativeText ? QShortcut::tr(keyname[i].name)
+ p = nativeText ? QCoreApplication::translate("QShortcut", keyname[i].name)
: QString::fromLatin1(keyname[i].name);
break;
}
diff --git a/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp b/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp
index 4135c9e86a..e679800ef4 100644
--- a/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp
+++ b/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp
@@ -44,7 +44,7 @@
#include "private/qfactoryloader_p.h"
#include "qmutex.h"
-#include "qapplication.h"
+#include "qguiapplication.h"
#include "qdebug.h"
QT_BEGIN_NAMESPACE
diff --git a/src/gui/guikernel/qsessionmanager_qpa.cpp b/src/gui/guikernel/qsessionmanager_qpa.cpp
index f6879f9efa..1b4e6a612b 100644
--- a/src/gui/guikernel/qsessionmanager_qpa.cpp
+++ b/src/gui/guikernel/qsessionmanager_qpa.cpp
@@ -40,10 +40,8 @@
****************************************************************************/
#include <qsessionmanager.h>
-#include <qapplication.h>
#include <private/qobject_p.h>
-#include <qapplication.h>
#ifndef QT_NO_SESSIONMANAGER
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index 7a9aee62fd..24f9c5f0e4 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -9,10 +9,7 @@ HEADERS += \
text/qfontmetrics.h \
text/qfont_p.h \
text/qfontsubset_p.h \
- text/qlinecontrol_p.h \
- text/qtextcontrol_p.h \
- text/qtextcontrol_p_p.h \
- text/qtextengine_p.h \
+ text/qtextengine_p.h \
text/qtextlayout.h \
text/qtextformat.h \
text/qtextformat_p.h \
@@ -52,9 +49,7 @@ SOURCES += \
text/qfontsubset.cpp \
text/qfontmetrics.cpp \
text/qfontdatabase.cpp \
- text/qlinecontrol.cpp \
- text/qtextcontrol.cpp \
- text/qtextengine.cpp \
+ text/qtextengine.cpp \
text/qtextlayout.cpp \
text/qtextformat.cpp \
text/qtextobject.cpp \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 03:33:55 +0000