Merge remote-tracking branch 'origin/5.7' into 5.8
5971b88eis not needed in new configure. This merge also reverts "fix QMAKE_DEFAULT_*DIRS resolution with apple SDK",2c9d15d7, because it breaks iOS build with new configure system. Conflicts: mkspecs/features/default_pre.prf mkspecs/features/mac/toolchain.prf mkspecs/features/toolchain.prf src/dbus/qdbusconnection.cpp src/plugins/sqldrivers/mysql/qsql_mysql.cpp src/sql/drivers/mysql/qsql_mysql.cpp src/widgets/widgets/qmenubar.cpp src/widgets/widgets/qmenubar_p.h tools/configure/configureapp.cpp tools/configure/environment.cpp tools/configure/environment.h Change-Id: I995533dd334211ebd25912db05b639d6f908aaec
This commit is contained in:
Liang Qi
commit
7555a92581
@ -43,9 +43,10 @@ extern "C" {
|
||||
#include <jpeglib.h>
|
||||
}
|
||||
|
||||
j_compress_ptr cinfo;
|
||||
|
||||
int main(int, char **)
|
||||
{
|
||||
j_compress_ptr cinfo;
|
||||
jpeg_create_compress(cinfo);
|
||||
return 0;
|
||||
}
|
||||
|
||||
339
dist/changes-5.6.2
vendored
Normal file
339
dist/changes-5.6.2
vendored
Normal file
@ -0,0 +1,339 @@
|
||||
Qt 5.6.2 is a bug-fix release. It maintains both forward and backward
|
||||
compatibility (source and binary) with Qt 5.6.0.
|
||||
|
||||
For more details, refer to the online documentation included in this
|
||||
distribution. The documentation is also available online:
|
||||
|
||||
http://doc.qt.io/qt-5/index.html
|
||||
|
||||
The Qt version 5.6 series is binary compatible with the 5.5.x series.
|
||||
Applications compiled for 5.5 will continue to run with 5.6.
|
||||
|
||||
Some of the changes listed in this file include issue tracking numbers
|
||||
corresponding to tasks in the Qt Bug Tracker:
|
||||
|
||||
https://bugreports.qt.io/
|
||||
|
||||
Each of these identifiers can be entered in the bug tracker to obtain more
|
||||
information about a particular change.
|
||||
|
||||
******************************************************************************
|
||||
* Important Behavior Changes *
|
||||
******************************************************************************
|
||||
|
||||
- [QTBUG-45031] The NSURLConnection backend of QNetworkAccessManager has
|
||||
been removed, since SecureTransport is the default SSL backend on iOS
|
||||
and is enabled by default. This means that building with -no-openssl
|
||||
-no-securetransport will no longer provide SSL capabilities on iOS.
|
||||
|
||||
- QUrl::resolved() no longer treats a URL with a scheme as a relative URL
|
||||
if it matches this URL's scheme. For now it still treats "file:name.txt"
|
||||
as relative for compatibility, but be warned that in Qt 5.8 it will no
|
||||
longer consider those to be relative. Both isRelative() and RFC 3986 say
|
||||
that such URLs are not relative, so starting from Qt 5.8, resolved() will
|
||||
return them as is.
|
||||
|
||||
- [QTBUG-47815] QDateTime now uses QLocale to get the "AM" and "PM" strings
|
||||
when parsing times, instead of strings obtained from the loaded
|
||||
translations.
|
||||
|
||||
******************************************************************************
|
||||
* Library *
|
||||
******************************************************************************
|
||||
|
||||
QtCore
|
||||
------
|
||||
|
||||
- Optimized toLatin1()/toUtf8() called on a QStringBuilder expression.
|
||||
- [QTBUG-18729][QTBUG-32457] Fixed a bug that caused Windows to show
|
||||
dialogs prompting the user to insert media when certain operations were
|
||||
made with Qt I/O classes, particularly QStorageInfo::mountedVolumes().
|
||||
|
||||
- QCommandLineParser:
|
||||
* The methods that exit() the application will now call cleanup routines
|
||||
registered with qAddPostRoutine.
|
||||
|
||||
- QDataStream:
|
||||
* Fixed compatibility of QTime serialization with Qt 3.
|
||||
|
||||
- QDebug:
|
||||
* Fixed streaming of QChars.
|
||||
|
||||
- QJsonObject:
|
||||
* Optimized equality operator.
|
||||
|
||||
- QJsonValue:
|
||||
* Fixed use-after-free in assignment operator.
|
||||
|
||||
- QLockFile:
|
||||
* Fixed permissions on lock files on Unix to allow for adjustments via
|
||||
umask.
|
||||
* [QTBUG-53392] Improved the robustness of detecting stale lock files on
|
||||
Windows.
|
||||
|
||||
- QMutex:
|
||||
* [QTBUG-54831] Fixed a bug that caused some applications to crash on
|
||||
exit, depending on the order of creation of certain statics inside Qt.
|
||||
|
||||
- QObject:
|
||||
* Fixed a crash when connecting a signal to a lambda or functor while
|
||||
using Qt::UniqueConnection (note: the connection is still not unique).
|
||||
|
||||
- QStringListModel:
|
||||
* Fixed dataChanged()'s 'roles' parameter to always contain both
|
||||
Qt::EditRole and Qt::DisplayRole.
|
||||
|
||||
- QTemporaryFile:
|
||||
* [QTBUG-54810] Fixed a bug that caused QTemporaryFile to fail when the
|
||||
file name contained non-ASCII characters, on Windows.
|
||||
|
||||
- QTimeZone:
|
||||
* [QTBUG-53071] Fixed a bug that caused QTimeZone to mis-parse time zones
|
||||
whose names were not simple letter and digit combinations.
|
||||
|
||||
- QUrl:
|
||||
* Made QUrl stricter in what it accepts for schemes, to comply with the
|
||||
relevant standards. QUrl will no longer accept schemes starting with a
|
||||
plus (+), a dash (-) or a dot (.).
|
||||
|
||||
- QVariant:
|
||||
* [QTBUG-53384] Fixed QVariant::canConvert and conversion from integer
|
||||
types to enumeration types.
|
||||
* [QTBUG-54893] Fixed a bug that caused QVariants not to compare properly
|
||||
if they contained QStringLists.
|
||||
|
||||
- QVector:
|
||||
* [QTBUG-51758] Fixed a bug that would cause QVector to crash if one
|
||||
called reserve(0).
|
||||
|
||||
- QXmlStreamReader:
|
||||
* Fixed a bug in the XML parser that prevented to load XML that
|
||||
contained invalid characters for XML 1.0.
|
||||
|
||||
- QXmlStreamWriter:
|
||||
* Fixed a bug that prevented the generation of valid XML files when
|
||||
using encoding with 8 bit per character but not ASCII compatible.
|
||||
QXMLStreamWriter generated XML markup using always ASCII in this case.
|
||||
|
||||
QtGui
|
||||
-----
|
||||
|
||||
- Fixed UBSan errors in
|
||||
* QColor
|
||||
* QGrayRaster
|
||||
* QRasterizer
|
||||
|
||||
- Removed a total of 1610 relocations from the library.
|
||||
|
||||
- QGuiApplication:
|
||||
* [QTBUG-51703] Fixed a bug that would cause QGuiApplication::sync() to
|
||||
be left undefined for Qt builds without session management support.
|
||||
|
||||
- QIconLoaderEngine:
|
||||
* Fixed theme lookup for scalable entries.
|
||||
|
||||
- Text:
|
||||
* [QTBUG-42033] Fixed bug where a QTextLayout with
|
||||
ShowLineAndParagraphSeparators would modify the layout's input string.
|
||||
* [QTBUG-49452] Fixed a performance regression in Freetype engine that
|
||||
was introduced in Qt 5.5.
|
||||
* [QTBUG-54180] Fixed performance regression when rapidly switching
|
||||
between a large set of fonts.
|
||||
|
||||
- Windows:
|
||||
* [QTBUG-54494] Fixed stretch when combined with either no or vertical
|
||||
hinting preference or a device pixel ratio different from 1.
|
||||
* [QTBUG-51024] Fixed height of text bounding box when using no or
|
||||
vertical hinting preference, or when the device pixel ratio is
|
||||
different from 1.
|
||||
|
||||
QtNetwork
|
||||
---------
|
||||
|
||||
- QAuthenticator:
|
||||
* [QTBUG-53338] Fixed crash when comparing an initialized QAuthenticator
|
||||
with an uninitialized QAuthenticator.
|
||||
|
||||
QtSql
|
||||
-----
|
||||
|
||||
- [QTBUG-53969][QTBUG-53237] Fixed QSqlQuery::prepare value truncation
|
||||
error when using UNSIGNED values in a MySQL database.
|
||||
|
||||
QtWidgets
|
||||
---------
|
||||
|
||||
- Fixed UBSan/Coverity errors in:
|
||||
* QAbstractItemView
|
||||
* QDataWidgetMapper
|
||||
* QTreeWidget
|
||||
* QWidgetLineControl
|
||||
|
||||
- Removed a total of 167 relocations from the library.
|
||||
|
||||
- QAbstractItemDelegate:
|
||||
* [QTBUG-16469] Show localized detailed tooltips and "What's this?"
|
||||
texts.
|
||||
|
||||
- QAbstractItemView:
|
||||
* [QTBUG-53541] Fixed a bug involving drawing the drop indicator
|
||||
where it shouldn't be drawn.
|
||||
* Fixed a bug in setSelectionModel() which could lead to model indexes
|
||||
from a different model be reused on a new model.
|
||||
|
||||
- QAbstractSpinBox:
|
||||
* [QTBUG-55249] Fixed a bug related to first key press.
|
||||
|
||||
- QColorDialog:
|
||||
* Fixed ignored alpha channel in getRgb().
|
||||
|
||||
- QComboBox:
|
||||
* [QTBUG-54191] Fixed a crash on setEditable(false) called from
|
||||
editTextChanged().
|
||||
|
||||
- QCompleter:
|
||||
* [QTBUG-54642] Fixed wrong completion role after a QFileSystemModel
|
||||
has been used.
|
||||
|
||||
- QDesktopWidget:
|
||||
* [QTBUG-52101] Fixed tracking of QScreens.
|
||||
* [QTBUG-52606] Fixed a bug related to DPI-scaling in screenNumber().
|
||||
|
||||
- QDialog:
|
||||
* [QTBUG-52735] Fixed a bug involving moves between screens with
|
||||
different DPI-scaling factors.
|
||||
|
||||
- QDockWidget:
|
||||
* [QTBUG-52107][QTBUG-53754] Fixed bugs related to floating group tab
|
||||
window title.
|
||||
* [QTBUG-52108] A QDockWidgetGroupWindow can now be dragged into one of
|
||||
its QDockWidgets.
|
||||
* [QTBUG-53808] Fixed a bug that caused an undocked dock widget to lose
|
||||
its decoration.
|
||||
* [QTBUG-54185] Unbroke drag-and-drop.
|
||||
|
||||
- QGraphicsProxyWidget:
|
||||
* [QTBUG-55112] Fixed a bug that caused the widget to receive events
|
||||
during construction.
|
||||
|
||||
- QLineEdit:
|
||||
* [QTBUG-49374] Fixed icons being too small on a High DPI screen
|
||||
without scaling.
|
||||
* [QTBUG-52796] Fixed QKeySequence::MoveToStartOfLine shortcut
|
||||
being ignored.
|
||||
* [QTBUG-54425] Fixed missing clear button on macOS.
|
||||
|
||||
- QMainWindow:
|
||||
* [QTBUG-50491] Fixed a bug related to restoring dock widgets with
|
||||
GroupedDragging.
|
||||
* [QTBUG-52108] Fixed a bug related to context menus in the presence of
|
||||
floating tabs.
|
||||
|
||||
- QMenu:
|
||||
* [QTBUG-53054] Submenus can now be opened on left mouse button
|
||||
press, too.
|
||||
|
||||
- QMenuBar:
|
||||
* [QTBUG-53205] Fixed bugs (incl. crashes) involving reparented
|
||||
menu bars.
|
||||
|
||||
- QOpenGLWidget:
|
||||
* [QTBUG-50818][QTBUG-51815][QTBUG-54241][QTBUG-52419] Fixed several
|
||||
repainting bugs and other drawing artifacts.
|
||||
|
||||
- QSideBar:
|
||||
* Fixed a nullptr dereference on platforms that do not support
|
||||
QFileSystemWatcher.
|
||||
|
||||
- QSystemTrayIcon:
|
||||
* [QTBUG-53591] Use large icon for balloon message on Windows systems.
|
||||
|
||||
- QTabBar:
|
||||
* Fixed a performance problem involving font metrics.
|
||||
|
||||
- QTreeView:
|
||||
* [QTBUG-52793] Fixed a key navigation bug when the columns were
|
||||
reordered.
|
||||
|
||||
- QTreeWidget:
|
||||
* [QTBUG-50207] Now handles device pixel ratio in animations correctly.
|
||||
|
||||
- QWidget:
|
||||
* [QTBUG-39887] Restored documented behavior for the
|
||||
WA_X11NetWmWindowType* attributes.
|
||||
* [QTBUG-41135][QTBUG-50030][QTBUG-50136][QTBUG-52507] Fixed
|
||||
mapTo/FromGlobal() in case of widget hierarchies embedded into
|
||||
QGraphicsView with transformations.
|
||||
* [QTBUG-45484] Fixed setWindowRole().
|
||||
* [QTBUG-50796] Reduced paint-events when resizing native widgets.
|
||||
* [QTBUG-52123] Fixed a bug by which opaque texture-based widgets
|
||||
were not always shown.
|
||||
* [QTBUG-53515] Added a workaround for render-to-texture widgets in
|
||||
fullscreen windows.
|
||||
* [QTBUG-54734] Worked around an issue with translucent GL windows
|
||||
on Windows.
|
||||
* [QTBUG-54906] Fixed a bug relaed to fullscreen handling on Windows.
|
||||
|
||||
- Styles:
|
||||
* Fixed several cases of QStyleOptions being created with null
|
||||
version.
|
||||
* [QTBUG-51266] Fixed painting of small progress bars on Vista+.
|
||||
* [QTBUG-54630] Fixed a crash in QMacStyle::styleHint().
|
||||
* [QTBUG-49374] The Windows style now takes the monitor's differing
|
||||
logical DPI into account when calculating native metrics.
|
||||
|
||||
******************************************************************************
|
||||
* Platform-specific Changes *
|
||||
******************************************************************************
|
||||
|
||||
Android
|
||||
-------
|
||||
|
||||
- [QTBUG-50724] Added support for clang compiler.
|
||||
- [QTBUG-53511] Fixed CJK font resolution on Android 7.
|
||||
|
||||
BSDs
|
||||
----
|
||||
|
||||
- The freebsd-g++ mkspec was moved back and no longer requires the
|
||||
"unsupported/" prefix, matching the FreeBSD ports tree, as FreeBSD 9.3
|
||||
still defaults to using GCC. Users of GCC that did not previously use
|
||||
the ports patch will need to adapt their build scripts and drop the
|
||||
"unsupported/" prefix.
|
||||
- Fixed a number of compilation issues on FreeBSD, NetBSD and OpenBSD. Qt
|
||||
should now build out-of-the-box (no patches needed) on those systems.
|
||||
|
||||
Linux
|
||||
-----
|
||||
|
||||
- [QTBUG-54733] It is now possible to opt out from installing signal
|
||||
handlers when running with eglfs and linuxfb by setting the
|
||||
QT_QPA_NO_SIGNAL_HANDLER environment variable to a non-zero value.
|
||||
- Fixed the value of the 'defined' field in ATSPI GetAttributeValue
|
||||
results.
|
||||
|
||||
macOS
|
||||
-----
|
||||
|
||||
- [QTBUG-48953] Pasting text from Qt applications to Apple Mail now works.
|
||||
- [QTBUG-48953] “text/vcard” is now required as the mime type when
|
||||
placing vCards on the clipboard.
|
||||
- OS X => macOS rename in Q_OS_ macros/docs, qmake scopes,
|
||||
file selectors, etc.
|
||||
- Add new QSysInfo values and MAC_OS_X / __MAC_ / __IPHONE_ values for
|
||||
macOS 10.12 and iOS 9.1 through 10.0.
|
||||
- Update prettyProductName with new macOS "Sierra" codename.
|
||||
|
||||
Windows
|
||||
-------
|
||||
|
||||
- Fixed a new[]/delete mismatch in Windows tablet support.
|
||||
|
||||
****************************************************************************
|
||||
* Tools *
|
||||
****************************************************************************
|
||||
|
||||
moc
|
||||
---
|
||||
- [QTBUG-53441] Fixed crash on file ending with a backslash followed by
|
||||
carriage return
|
||||
@ -304,15 +304,19 @@ void Window::contextMenu(const QPoint &pos)
|
||||
if (!item)
|
||||
return;
|
||||
QMenu menu;
|
||||
#ifndef QT_NO_CLIPBOARD
|
||||
QAction *copyAction = menu.addAction("Copy Name");
|
||||
#endif
|
||||
QAction *openAction = menu.addAction("Open");
|
||||
QAction *action = menu.exec(filesTable->mapToGlobal(pos));
|
||||
if (!action)
|
||||
return;
|
||||
const QString fileName = fileNameOfItem(item);
|
||||
if (action == copyAction)
|
||||
QGuiApplication::clipboard()->setText(QDir::toNativeSeparators(fileName));
|
||||
else if (action == openAction)
|
||||
if (action == openAction)
|
||||
openFile(fileName);
|
||||
#ifndef QT_NO_CLIPBOARD
|
||||
else if (action == copyAction)
|
||||
QGuiApplication::clipboard()->setText(QDir::toNativeSeparators(fileName));
|
||||
#endif
|
||||
}
|
||||
//! [16]
|
||||
|
||||
@ -203,10 +203,10 @@ contains(qt_module_deps, qml): \
|
||||
# run qmlimportscanner
|
||||
qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
|
||||
for (QMLPATH, QMLPATHS): \
|
||||
IMPORTPATHS += -importPath $$QMLPATH
|
||||
IMPORTPATHS += -importPath $$system_quote($$QMLPATH)
|
||||
|
||||
#message(run $$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS)
|
||||
JSON = $$system($$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS)
|
||||
JSON = $$system($$QMLIMPORTSCANNER $$system_quote($$_PRO_FILE_PWD_) $$IMPORTPATHS)
|
||||
|
||||
parseJson(JSON, IMPORTS)| error("Failed to parse qmlimportscanner output.")
|
||||
|
||||
@ -267,13 +267,13 @@ contains(qt_module_deps, qml): \
|
||||
# But strip away archives and other files that are not needed:
|
||||
!isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += ";"
|
||||
QMAKE_POST_LINK += \
|
||||
"cp $$OUT_PWD/qt.conf $$qtconfTargetPath; " \
|
||||
"test -d $$qmlTargetPath && rm -r $$qmlTargetPath; " \
|
||||
"mkdir -p $$qmlTargetPath && " \
|
||||
"cp $$shell_quote($$OUT_PWD/qt.conf) \"$$qtconfTargetPath\"; " \
|
||||
"test -d \"$$qmlTargetPath\" && rm -r \"$$qmlTargetPath\"; " \
|
||||
"mkdir -p \"$$qmlTargetPath\" && " \
|
||||
"for p in $$QMLPATHS; do" \
|
||||
"rsync -r --exclude='*.a' --exclude='*.prl' --exclude='*.qmltypes' "
|
||||
macx-xcode: QMAKE_POST_LINK += "$p/ $$qmlTargetPath; done"
|
||||
else: QMAKE_POST_LINK += "\$\$p/ $$qmlTargetPath; done"
|
||||
macx-xcode: QMAKE_POST_LINK += "$p/ \"$$qmlTargetPath\"; done"
|
||||
else: QMAKE_POST_LINK += "\$\$p/ \"$$qmlTargetPath\"; done"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -33,6 +33,7 @@
|
||||
#include <qregexp.h>
|
||||
#include <qcryptographichash.h>
|
||||
#include <qdebug.h>
|
||||
#include <qsettings.h>
|
||||
#include <qstring.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
@ -1403,6 +1404,28 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
|
||||
QString configName = (as_release ? "Release" : "Debug");
|
||||
|
||||
QMap<QString, QString> settings;
|
||||
if (!project->isActiveConfig("no_xcode_development_team")) {
|
||||
const QSettings xcodeSettings(
|
||||
QDir::homePath() + QLatin1String("/Library/Preferences/com.apple.dt.Xcode.plist"),
|
||||
QSettings::NativeFormat);
|
||||
const QVariantMap teams = xcodeSettings.value(QLatin1String("IDEProvisioningTeams")).toMap();
|
||||
if (!teams.isEmpty()) {
|
||||
for (QVariantMap::const_iterator it = teams.begin(), end = teams.end(); it != end; ++it) {
|
||||
const QVariantMap team = it.value().toMap();
|
||||
const QString teamType = team.value(QLatin1String("teamType")).toString();
|
||||
|
||||
// Skip Company teams because signing permissions may not be available under all
|
||||
// circumstances for users who are not the Team Agent
|
||||
if (teamType != QLatin1String("Company")) {
|
||||
const QString teamId = team.value(QLatin1String("teamID")).toString();
|
||||
settings.insert("DEVELOPMENT_TEAM", teamId);
|
||||
|
||||
// first suitable team we found is the one we'll use by default
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
settings.insert("COPY_PHASE_STRIP", (as_release ? "YES" : "NO"));
|
||||
// required for tvOS (and watchos), optional on iOS (deployment target >= iOS 6.0)
|
||||
settings.insert("ENABLE_BITCODE", project->isActiveConfig("bitcode") ? "YES" : "NO");
|
||||
|
||||
@ -1199,7 +1199,8 @@ void QMessagePattern::setPattern(const QString &pattern)
|
||||
#if defined(QLOGGING_HAVE_BACKTRACE) && !defined(QT_BOOTSTRAPPED)
|
||||
// make sure the function has "Message" in the name so the function is removed
|
||||
|
||||
#if (defined(Q_CC_GNU) && defined(QT_COMPILER_SUPPORTS_SIMD_ALWAYS)) || QT_HAS_ATTRIBUTE(optimize)
|
||||
#if ((defined(Q_CC_GNU) && defined(QT_COMPILER_SUPPORTS_SIMD_ALWAYS)) || QT_HAS_ATTRIBUTE(optimize)) \
|
||||
&& !defined(Q_CC_INTEL)
|
||||
// force skipping the frame pointer, to save the backtrace() function some work
|
||||
__attribute__((optimize("omit-frame-pointer")))
|
||||
#endif
|
||||
|
||||
@ -185,7 +185,7 @@ inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {}
|
||||
|
||||
#if defined(Q_CC_CLANG) && Q_CC_CLANG >= 306
|
||||
# define Q_OBJECT_NO_OVERRIDE_WARNING QT_WARNING_DISABLE_CLANG("-Winconsistent-missing-override")
|
||||
#elif defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && Q_CC_GNU >= 510
|
||||
#elif defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && Q_CC_GNU >= 501
|
||||
# define Q_OBJECT_NO_OVERRIDE_WARNING QT_WARNING_DISABLE_GCC("-Wsuggest-override")
|
||||
#else
|
||||
# define Q_OBJECT_NO_OVERRIDE_WARNING
|
||||
|
||||
@ -845,7 +845,7 @@ static QString toStringIsoDate(qint64 jd)
|
||||
range 0 to 9999. This restriction may apply to locale-aware
|
||||
formats as well, depending on the locale settings.
|
||||
|
||||
\sa shortDayName(), shortMonthName()
|
||||
\sa fromString(), shortDayName(), shortMonthName(), QLocale::toString()
|
||||
*/
|
||||
QString QDate::toString(Qt::DateFormat format) const
|
||||
{
|
||||
@ -921,7 +921,7 @@ QString QDate::toString(Qt::DateFormat format) const
|
||||
|
||||
If the datetime is invalid, an empty string will be returned.
|
||||
|
||||
\sa QDateTime::toString(), QTime::toString(), QLocale::toString()
|
||||
\sa fromString(), QDateTime::toString(), QTime::toString(), QLocale::toString()
|
||||
|
||||
*/
|
||||
QString QDate::toString(const QString& format) const
|
||||
@ -1201,6 +1201,8 @@ qint64 QDate::daysTo(const QDate &d) const
|
||||
Note for Qt::TextDate: It is recommended that you use the
|
||||
English short month names (e.g. "Jan"). Although localized month
|
||||
names can also be used, they depend on the user's locale settings.
|
||||
|
||||
\sa toString(), QLocale::toDate()
|
||||
*/
|
||||
QDate QDate::fromString(const QString& string, Qt::DateFormat format)
|
||||
{
|
||||
@ -1319,8 +1321,8 @@ QDate QDate::fromString(const QString& string, Qt::DateFormat format)
|
||||
|
||||
\snippet code/src_corelib_tools_qdatetime.cpp 3
|
||||
|
||||
\sa QDateTime::fromString(), QTime::fromString(), QDate::toString(),
|
||||
QDateTime::toString(), QTime::toString()
|
||||
\sa toString(), QDateTime::fromString(), QTime::fromString(),
|
||||
QLocale::toDate()
|
||||
*/
|
||||
|
||||
QDate QDate::fromString(const QString &string, const QString &format)
|
||||
@ -1587,7 +1589,7 @@ int QTime::msec() const
|
||||
|
||||
If the time is invalid, an empty string will be returned.
|
||||
|
||||
\sa QDate::toString(), QDateTime::toString()
|
||||
\sa fromString(), QDate::toString(), QDateTime::toString(), QLocale::toString()
|
||||
*/
|
||||
|
||||
QString QTime::toString(Qt::DateFormat format) const
|
||||
@ -1660,7 +1662,7 @@ QString QTime::toString(Qt::DateFormat format) const
|
||||
If the time is invalid, an empty string will be returned.
|
||||
If \a format is empty, the default format "hh:mm:ss" is used.
|
||||
|
||||
\sa QDate::toString(), QDateTime::toString(), QLocale::toString()
|
||||
\sa fromString(), QDate::toString(), QDateTime::toString(), QLocale::toString()
|
||||
*/
|
||||
QString QTime::toString(const QString& format) const
|
||||
{
|
||||
@ -1932,6 +1934,8 @@ static QTime fromIsoTimeString(const QStringRef &string, Qt::DateFormat format,
|
||||
this may result in two conversion attempts (if the conversion
|
||||
fails for the default locale). This should be considered an
|
||||
implementation detail.
|
||||
|
||||
\sa toString(), QLocale::toTime()
|
||||
*/
|
||||
QTime QTime::fromString(const QString& string, Qt::DateFormat format)
|
||||
{
|
||||
@ -2005,8 +2009,8 @@ QTime QTime::fromString(const QString& string, Qt::DateFormat format)
|
||||
|
||||
\snippet code/src_corelib_tools_qdatetime.cpp 8
|
||||
|
||||
\sa QDateTime::fromString(), QDate::fromString(), QDate::toString(),
|
||||
QDateTime::toString(), QTime::toString()
|
||||
\sa toString(), QDateTime::fromString(), QDate::fromString(),
|
||||
QLocale::toTime()
|
||||
*/
|
||||
|
||||
QTime QTime::fromString(const QString &string, const QString &format)
|
||||
@ -3732,7 +3736,8 @@ void QDateTime::setTime_t(uint secsSince1Jan1970UTC)
|
||||
range 0 to 9999. This restriction may apply to locale-aware
|
||||
formats as well, depending on the locale settings.
|
||||
|
||||
\sa QDate::toString(), QTime::toString(), Qt::DateFormat
|
||||
\sa fromString(), QDate::toString(), QTime::toString(),
|
||||
QLocale::toString()
|
||||
*/
|
||||
|
||||
QString QDateTime::toString(Qt::DateFormat format) const
|
||||
@ -3872,7 +3877,7 @@ QString QDateTime::toString(Qt::DateFormat format) const
|
||||
|
||||
If the datetime is invalid, an empty string will be returned.
|
||||
|
||||
\sa QDate::toString(), QTime::toString(), QLocale::toString()
|
||||
\sa fromString(), QDate::toString(), QTime::toString(), QLocale::toString()
|
||||
*/
|
||||
QString QDateTime::toString(const QString& format) const
|
||||
{
|
||||
@ -4615,6 +4620,8 @@ int QDateTime::utcOffset() const
|
||||
Note for Qt::TextDate: It is recommended that you use the
|
||||
English short month names (e.g. "Jan"). Although localized month
|
||||
names can also be used, they depend on the user's locale settings.
|
||||
|
||||
\sa toString(), QLocale::toDateTime()
|
||||
*/
|
||||
QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format)
|
||||
{
|
||||
@ -4916,8 +4923,8 @@ QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format)
|
||||
|
||||
\snippet code/src_corelib_tools_qdatetime.cpp 14
|
||||
|
||||
\sa QDate::fromString(), QTime::fromString(), QDate::toString(),
|
||||
QDateTime::toString(), QTime::toString()
|
||||
\sa toString(), QDate::fromString(), QTime::fromString(),
|
||||
QLocale::toDateTime()
|
||||
*/
|
||||
|
||||
QDateTime QDateTime::fromString(const QString &string, const QString &format)
|
||||
|
||||
@ -976,6 +976,7 @@ inline QString QString::section(QChar asep, int astart, int aend, SectionFlags a
|
||||
|
||||
QT_WARNING_PUSH
|
||||
QT_WARNING_DISABLE_MSVC(4127) // "conditional expression is constant"
|
||||
QT_WARNING_DISABLE_INTEL(111) // "statement is unreachable"
|
||||
|
||||
inline int QString::toWCharArray(wchar_t *array) const
|
||||
{
|
||||
@ -1157,21 +1158,21 @@ inline bool operator!=(QString::Null, const QString &s) { return !s.isNull(); }
|
||||
inline bool operator!=(const QString &s, QString::Null) { return !s.isNull(); }
|
||||
|
||||
inline bool operator==(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
|
||||
{ return (s1.size() == s2.size() && !memcmp(s1.latin1(), s2.latin1(), s1.size())); }
|
||||
{ return s1.size() == s2.size() && (!s1.size() || !memcmp(s1.latin1(), s2.latin1(), s1.size())); }
|
||||
inline bool operator!=(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
|
||||
{ return (s1.size() != s2.size() || memcmp(s1.latin1(), s2.latin1(), s1.size())); }
|
||||
{ return !operator==(s1, s2); }
|
||||
inline bool operator<(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
|
||||
{ int r = memcmp(s1.latin1(), s2.latin1(), qMin(s1.size(), s2.size()));
|
||||
return (r < 0) || (r == 0 && s1.size() < s2.size()); }
|
||||
inline bool operator<=(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
|
||||
{ int r = memcmp(s1.latin1(), s2.latin1(), qMin(s1.size(), s2.size()));
|
||||
return (r < 0) || (r == 0 && s1.size() <= s2.size()); }
|
||||
{
|
||||
const int len = qMin(s1.size(), s2.size());
|
||||
const int r = len ? memcmp(s1.latin1(), s2.latin1(), len) : 0;
|
||||
return r < 0 || (r == 0 && s1.size() < s2.size());
|
||||
}
|
||||
inline bool operator>(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
|
||||
{ int r = memcmp(s1.latin1(), s2.latin1(), qMin(s1.size(), s2.size()));
|
||||
return (r > 0) || (r == 0 && s1.size() > s2.size()); }
|
||||
{ return operator<(s2, s1); }
|
||||
inline bool operator<=(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
|
||||
{ return !operator>(s1, s2); }
|
||||
inline bool operator>=(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
|
||||
{ int r = memcmp(s1.latin1(), s2.latin1(), qMin(s1.size(), s2.size()));
|
||||
return (r > 0) || (r == 0 && s1.size() >= s2.size()); }
|
||||
{ return !operator<(s1, s2); }
|
||||
|
||||
inline bool QLatin1String::operator==(const QString &s) const Q_DECL_NOTHROW
|
||||
{ return s == *this; }
|
||||
|
||||
@ -71,24 +71,6 @@ QT_BEGIN_NAMESPACE
|
||||
|
||||
Q_GLOBAL_STATIC(QDBusConnectionManager, _q_manager)
|
||||
|
||||
// can be replaced with a lambda in Qt 5.7
|
||||
class QDBusConnectionDispatchEnabler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
QDBusConnectionPrivate *con;
|
||||
public:
|
||||
QDBusConnectionDispatchEnabler(QDBusConnectionPrivate *con) : con(con) {}
|
||||
|
||||
public slots:
|
||||
void execute()
|
||||
{
|
||||
con->setDispatchEnabled(true);
|
||||
if (!con->ref.deref())
|
||||
con->deleteLater();
|
||||
deleteLater();
|
||||
}
|
||||
};
|
||||
|
||||
struct QDBusConnectionManager::ConnectionRequestData
|
||||
{
|
||||
enum RequestType {
|
||||
@ -1280,6 +1262,4 @@ QByteArray QDBusConnection::localMachineId()
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#include "qdbusconnection.moc"
|
||||
|
||||
#endif // QT_NO_DBUS
|
||||
|
||||
@ -381,6 +381,25 @@ extern QDBusMessage qDBusPropertySet(const QDBusConnectionPrivate::ObjectTreeNod
|
||||
const QDBusMessage &msg);
|
||||
extern QDBusMessage qDBusPropertyGetAll(const QDBusConnectionPrivate::ObjectTreeNode &node,
|
||||
const QDBusMessage &msg);
|
||||
|
||||
// can be replaced with a lambda in Qt 5.7
|
||||
class QDBusConnectionDispatchEnabler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
QDBusConnectionPrivate *con;
|
||||
public:
|
||||
QDBusConnectionDispatchEnabler(QDBusConnectionPrivate *con) : con(con) {}
|
||||
|
||||
public slots:
|
||||
void execute()
|
||||
{
|
||||
con->setDispatchEnabled(true);
|
||||
if (!con->ref.deref())
|
||||
con->deleteLater();
|
||||
deleteLater();
|
||||
}
|
||||
};
|
||||
|
||||
#endif // QT_BOOTSTRAPPED
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
@ -100,8 +100,8 @@ public:
|
||||
QDBusError(const QDBusError &other);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
QDBusError(QDBusError &&other) Q_DECL_NOTHROW
|
||||
: code(other.code), msg(std::move(other.msg)), nm(std::move(other.nm)), unused(other.unused)
|
||||
{ other.unused = Q_NULLPTR; }
|
||||
: code(other.code), msg(std::move(other.msg)), nm(std::move(other.nm))
|
||||
{}
|
||||
QDBusError &operator=(QDBusError &&other) Q_DECL_NOTHROW { swap(other); return *this; }
|
||||
#endif
|
||||
QDBusError &operator=(const QDBusError &other);
|
||||
@ -114,7 +114,6 @@ public:
|
||||
qSwap(code, other.code);
|
||||
qSwap(msg, other.msg);
|
||||
qSwap(nm, other.nm);
|
||||
qSwap(unused, other.unused);
|
||||
}
|
||||
|
||||
ErrorType type() const;
|
||||
@ -128,6 +127,8 @@ private:
|
||||
ErrorType code;
|
||||
QString msg;
|
||||
QString nm;
|
||||
// ### This class has an implicit (therefore inline) destructor
|
||||
// so the following field cannot be used:
|
||||
void *unused;
|
||||
};
|
||||
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusError)
|
||||
|
||||
@ -315,9 +315,21 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, v
|
||||
// setPeer does the error handling for us
|
||||
QDBusErrorInternal error;
|
||||
newConnection->setPeer(connection, error);
|
||||
newConnection->setDispatchEnabled(false);
|
||||
|
||||
// this is a queued connection and will resume in the QDBusServer's thread
|
||||
emit serverConnection->newServerConnection(newConnection);
|
||||
|
||||
// we've disabled dispatching of events, so now we post an event to the
|
||||
// QDBusServer's thread in order to enable it after the
|
||||
// QDBusServer::newConnection() signal has been received by the
|
||||
// application's code
|
||||
newConnection->ref.ref();
|
||||
QReadLocker serverLock(&serverConnection->lock);
|
||||
QDBusConnectionDispatchEnabler *o = new QDBusConnectionDispatchEnabler(newConnection);
|
||||
QTimer::singleShot(0, o, SLOT(execute()));
|
||||
if (serverConnection->serverObject)
|
||||
o->moveToThread(serverConnection->serverObject->thread());
|
||||
}
|
||||
|
||||
void QDBusConnectionPrivate::_q_newConnection(QDBusConnectionPrivate *newConnection)
|
||||
@ -1250,6 +1262,7 @@ void QDBusConnectionPrivate::relaySignal(QObject *obj, const QMetaObject *mo, in
|
||||
break;
|
||||
}
|
||||
|
||||
checkThread();
|
||||
QDBusReadLocker locker(RelaySignalAction, this);
|
||||
QDBusMessage message = QDBusMessage::createSignal(QLatin1String("/"), interface,
|
||||
QLatin1String(memberName));
|
||||
@ -2358,12 +2371,9 @@ void QDBusConnectionPrivate::registerObject(const ObjectTreeNode *node)
|
||||
connector->connectAllSignals(node->obj);
|
||||
}
|
||||
|
||||
// disconnect and reconnect to avoid duplicates
|
||||
connector->disconnect(SIGNAL(relaySignal(QObject*,const QMetaObject*,int,QVariantList)),
|
||||
this, SLOT(relaySignal(QObject*,const QMetaObject*,int,QVariantList)));
|
||||
connect(connector, SIGNAL(relaySignal(QObject*,const QMetaObject*,int,QVariantList)),
|
||||
this, SLOT(relaySignal(QObject*,const QMetaObject*,int,QVariantList)),
|
||||
Qt::DirectConnection);
|
||||
Qt::ConnectionType(Qt::QueuedConnection | Qt::UniqueConnection));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -103,12 +103,14 @@ QDBusServer::QDBusServer(QObject *parent)
|
||||
*/
|
||||
QDBusServer::~QDBusServer()
|
||||
{
|
||||
QWriteLocker locker(&d->lock);
|
||||
if (QDBusConnectionManager::instance()) {
|
||||
QMutexLocker locker(&QDBusConnectionManager::instance()->mutex);
|
||||
for (const QString &name : qAsConst(d->serverConnectionNames))
|
||||
QDBusConnectionManager::instance()->removeConnection(name);
|
||||
d->serverConnectionNames.clear();
|
||||
}
|
||||
d->serverObject = nullptr;
|
||||
d->ref.store(0);
|
||||
d->deleteLater();
|
||||
}
|
||||
|
||||
@ -63,7 +63,8 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
namespace QDBusUtil
|
||||
#define Q_DBUS_NO_EXPORT // force findclasslist.pl looking into this namespace
|
||||
namespace Q_DBUS_NO_EXPORT QDBusUtil
|
||||
{
|
||||
Q_DBUS_EXPORT bool isValidInterfaceName(const QString &ifaceName);
|
||||
|
||||
|
||||
@ -170,11 +170,11 @@ static inline qreal initialGlobalScaleFactor()
|
||||
The QT_SCALE_FACTOR environment variable can be used to set
|
||||
a global scale factor for all windows in the processs. This
|
||||
is useful for testing and debugging (you can simulate any
|
||||
devicePixelRatio without needing access to sepcial hardware),
|
||||
devicePixelRatio without needing access to special hardware),
|
||||
and perhaps also for targeting a specific application to
|
||||
a specific display type (embedded use cases).
|
||||
|
||||
2) A per-screen scale factors
|
||||
2) Per-screen scale factors
|
||||
Some platform plugins support providing a per-screen scale
|
||||
factor based on display density information. These platforms
|
||||
include X11, Windows, and Android.
|
||||
@ -187,13 +187,13 @@ static inline qreal initialGlobalScaleFactor()
|
||||
Enabling either will make QHighDpiScaling call QPlatformScreen::pixelDensity()
|
||||
and use the value provided as the scale factor for the screen in
|
||||
question. Disabling is done on a 'veto' basis where either the
|
||||
environment or the application source can disable. The intended use
|
||||
environment or the application can disable the scaling. The intended use
|
||||
cases are 'My system is not providing correct display density
|
||||
information' and 'My application needs to work in display pixels',
|
||||
respectively.
|
||||
|
||||
The QT_SCREEN_SCALE_FACTORS environment variable can be used to set the screen
|
||||
scale factors manually.Set this to a semicolon-separated
|
||||
scale factors manually. Set this to a semicolon-separated
|
||||
list of scale factors (matching the order of QGuiApplications::screens()),
|
||||
or to a list of name=value pairs (where name matches QScreen::name()).
|
||||
|
||||
|
||||
@ -928,7 +928,7 @@ void QTextEngine::shapeLine(const QScriptLine &line)
|
||||
if (item == -1)
|
||||
return;
|
||||
|
||||
const int end = findItem(line.from + line.length - 1, item);
|
||||
const int end = findItem(line.from + line.length + line.trailingSpaces - 1, item);
|
||||
for ( ; item <= end; ++item) {
|
||||
QScriptItem &si = layoutData->items[item];
|
||||
if (si.analysis.flags == QScriptAnalysis::Tab) {
|
||||
|
||||
@ -67,6 +67,8 @@ QDBusPlatformMenuItem::QDBusPlatformMenuItem(quintptr tag)
|
||||
QDBusPlatformMenuItem::~QDBusPlatformMenuItem()
|
||||
{
|
||||
menuItemsByID.remove(m_dbusID);
|
||||
if (m_subMenu)
|
||||
static_cast<QDBusPlatformMenu *>(m_subMenu)->setContainingMenuItem(Q_NULLPTR);
|
||||
}
|
||||
|
||||
void QDBusPlatformMenuItem::setTag(quintptr tag)
|
||||
@ -176,6 +178,8 @@ QDBusPlatformMenu::QDBusPlatformMenu(quintptr tag)
|
||||
|
||||
QDBusPlatformMenu::~QDBusPlatformMenu()
|
||||
{
|
||||
if (m_containingMenuItem)
|
||||
m_containingMenuItem->setMenu(Q_NULLPTR);
|
||||
}
|
||||
|
||||
void QDBusPlatformMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before)
|
||||
|
||||
@ -125,6 +125,8 @@ void QDBusTrayIcon::cleanup()
|
||||
dBusConnection()->unregisterTrayIcon(this);
|
||||
delete m_dbusConnection;
|
||||
m_dbusConnection = Q_NULLPTR;
|
||||
delete m_notifier;
|
||||
m_notifier = Q_NULLPTR;
|
||||
m_registered = false;
|
||||
}
|
||||
|
||||
@ -162,9 +164,10 @@ QTemporaryFile *QDBusTrayIcon::tempIcon(const QIcon &icon)
|
||||
}
|
||||
if (!necessary)
|
||||
return Q_NULLPTR;
|
||||
qreal dpr = qGuiApp->devicePixelRatio();
|
||||
QTemporaryFile *ret = new QTemporaryFile(TempFileTemplate, this);
|
||||
ret->open();
|
||||
icon.pixmap(QSize(22, 22)).save(ret);
|
||||
icon.pixmap(QSize(22 * dpr, 22 * dpr)).save(ret);
|
||||
ret->close();
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -112,15 +112,15 @@ static QByteArray localHostName()
|
||||
*/
|
||||
static QComposeCacheFileHeader readFileMetadata(const QString &path)
|
||||
{
|
||||
QComposeCacheFileHeader info;
|
||||
info.reserved = 0;
|
||||
info.fileSize = 0;
|
||||
quint64 fileSize = 0;
|
||||
qint64 lastModified = 0;
|
||||
const QByteArray pathBytes = QFile::encodeName(path);
|
||||
QT_STATBUF st;
|
||||
if (QT_STAT(pathBytes.data(), &st) != 0)
|
||||
return info;
|
||||
info.lastModified = st.st_mtime;
|
||||
info.fileSize = st.st_size;
|
||||
if (QT_STAT(pathBytes.data(), &st) == 0) {
|
||||
lastModified = st.st_mtime;
|
||||
fileSize = st.st_size;
|
||||
}
|
||||
QComposeCacheFileHeader info = { 0, 0, fileSize, lastModified };
|
||||
return info;
|
||||
}
|
||||
|
||||
|
||||
@ -168,11 +168,19 @@ bool QComposeInputContext::checkComposeTable()
|
||||
TableGenerator reader;
|
||||
m_tableState = reader.tableState();
|
||||
|
||||
if ((m_tableState & TableGenerator::NoErrors) == TableGenerator::NoErrors)
|
||||
m_composeTable = reader.composeTable();
|
||||
|
||||
m_compositionTableInitialized = true;
|
||||
if ((m_tableState & TableGenerator::NoErrors) == TableGenerator::NoErrors) {
|
||||
m_composeTable = reader.composeTable();
|
||||
} else {
|
||||
#ifdef DEBUG_COMPOSING
|
||||
qDebug( "### FAILED_PARSING ###" );
|
||||
#endif
|
||||
// if we have errors, don' try to look things up anyways.
|
||||
reset();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Q_ASSERT(!m_composeTable.isEmpty());
|
||||
QVector<QComposeTableElement>::const_iterator it =
|
||||
std::lower_bound(m_composeTable.constBegin(), m_composeTable.constEnd(), m_composeBuffer, Compare());
|
||||
|
||||
|
||||
@ -672,11 +672,6 @@ static void updateApplicationState(JNIEnv */*env*/, jobject /*thiz*/, jint state
|
||||
QAndroidEventDispatcherStopper::instance()->goingToStop(true);
|
||||
QCoreApplication::processEvents();
|
||||
QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationState(state));
|
||||
{
|
||||
AndroidDeadlockProtector protector;
|
||||
if (protector.acquire())
|
||||
QWindowSystemInterface::flushWindowSystemEvents();
|
||||
}
|
||||
if (state == Qt::ApplicationSuspended)
|
||||
QAndroidEventDispatcherStopper::instance()->stopAll();
|
||||
} else {
|
||||
|
||||
@ -155,7 +155,7 @@ void QAndroidPlatformWindow::updateStatusBarVisibility()
|
||||
if (!isNonRegularWindow) {
|
||||
if (m_windowState & Qt::WindowFullScreen)
|
||||
QtAndroid::hideStatusBar();
|
||||
else if (m_windowState & Qt::WindowMaximized)
|
||||
else
|
||||
QtAndroid::showStatusBar();
|
||||
}
|
||||
}
|
||||
|
||||
@ -108,7 +108,7 @@ bool QIOSMessageDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality win
|
||||
Q_UNUSED(windowFlags);
|
||||
if (m_alertController // Ensure that the dialog is not showing already
|
||||
|| !options() // Some message dialogs don't have options (QErrorMessage)
|
||||
|| windowModality != Qt::ApplicationModal // We can only do app modal dialogs
|
||||
|| windowModality == Qt::NonModal // We can only do modal dialogs
|
||||
|| QSysInfo::MacintoshVersion < QSysInfo::MV_IOS_8_0) // API limitation
|
||||
return false;
|
||||
|
||||
|
||||
@ -299,7 +299,11 @@ static void executeBlockWithoutAnimation(Block block)
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0)
|
||||
@interface QIOSHandleLayer : CALayer <CAAnimationDelegate> {
|
||||
#else
|
||||
@interface QIOSHandleLayer : CALayer {
|
||||
#endif
|
||||
CALayer *_handleCursorLayer;
|
||||
CALayer *_handleKnobLayer;
|
||||
Qt::Edge _selectionEdge;
|
||||
|
||||
@ -112,7 +112,7 @@ static inline QQnxIntegration::Options parseOptions(const QStringList ¶mList
|
||||
options |= QQnxIntegration::FullScreenApplication;
|
||||
}
|
||||
|
||||
if (!paramList.contains(QLatin1String("flush-screen-context"))) {
|
||||
if (paramList.contains(QLatin1String("flush-screen-context"))) {
|
||||
options |= QQnxIntegration::AlwaysFlushScreenContext;
|
||||
}
|
||||
|
||||
|
||||
@ -49,6 +49,17 @@
|
||||
|
||||
#include <screen/screen.h>
|
||||
|
||||
// For pre-7.0 SDPs, map some screen property names to the old
|
||||
// names.
|
||||
#include <sys/neutrino.h>
|
||||
#if _NTO_VERSION < 700
|
||||
const int SCREEN_PROPERTY_FLAGS = SCREEN_PROPERTY_KEY_FLAGS;
|
||||
const int SCREEN_PROPERTY_FOCUS = SCREEN_PROPERTY_KEYBOARD_FOCUS;
|
||||
const int SCREEN_PROPERTY_MODIFIERS = SCREEN_PROPERTY_KEY_MODIFIERS;
|
||||
const int SCREEN_PROPERTY_SCAN = SCREEN_PROPERTY_KEY_SCAN;
|
||||
const int SCREEN_PROPERTY_SYM = SCREEN_PROPERTY_KEY_SYM;
|
||||
#endif
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QQnxWindow;
|
||||
|
||||
@ -239,20 +239,20 @@ void QQnxScreenEventHandler::handleKeyboardEvent(screen_event_t event)
|
||||
{
|
||||
// get flags of key event
|
||||
int flags;
|
||||
Q_SCREEN_CHECKERROR(screen_get_event_property_iv(event, SCREEN_PROPERTY_KEY_FLAGS, &flags),
|
||||
Q_SCREEN_CHECKERROR(screen_get_event_property_iv(event, SCREEN_PROPERTY_FLAGS, &flags),
|
||||
"Failed to query event flags");
|
||||
|
||||
// get key code
|
||||
int sym;
|
||||
Q_SCREEN_CHECKERROR(screen_get_event_property_iv(event, SCREEN_PROPERTY_KEY_SYM, &sym),
|
||||
Q_SCREEN_CHECKERROR(screen_get_event_property_iv(event, SCREEN_PROPERTY_SYM, &sym),
|
||||
"Failed to query event sym");
|
||||
|
||||
int modifiers;
|
||||
Q_SCREEN_CHECKERROR(screen_get_event_property_iv(event, SCREEN_PROPERTY_KEY_MODIFIERS, &modifiers),
|
||||
Q_SCREEN_CHECKERROR(screen_get_event_property_iv(event, SCREEN_PROPERTY_MODIFIERS, &modifiers),
|
||||
"Failed to query event modifieres");
|
||||
|
||||
int scan;
|
||||
Q_SCREEN_CHECKERROR(screen_get_event_property_iv(event, SCREEN_PROPERTY_KEY_SCAN, &scan),
|
||||
Q_SCREEN_CHECKERROR(screen_get_event_property_iv(event, SCREEN_PROPERTY_SCAN, &scan),
|
||||
"Failed to query event scan");
|
||||
|
||||
int cap;
|
||||
@ -594,7 +594,7 @@ void QQnxScreenEventHandler::handlePropertyEvent(screen_event_t event)
|
||||
qFatal("QQnx: failed to query window property, errno=%d", errno);
|
||||
|
||||
switch (property) {
|
||||
case SCREEN_PROPERTY_KEYBOARD_FOCUS:
|
||||
case SCREEN_PROPERTY_FOCUS:
|
||||
handleKeyboardFocusPropertyEvent(window);
|
||||
break;
|
||||
default:
|
||||
@ -607,7 +607,7 @@ void QQnxScreenEventHandler::handleKeyboardFocusPropertyEvent(screen_window_t wi
|
||||
{
|
||||
errno = 0;
|
||||
int focus = 0;
|
||||
if (Q_UNLIKELY(window && screen_get_window_property_iv(window, SCREEN_PROPERTY_KEYBOARD_FOCUS, &focus) != 0))
|
||||
if (Q_UNLIKELY(window && screen_get_window_property_iv(window, SCREEN_PROPERTY_FOCUS, &focus) != 0))
|
||||
qFatal("QQnx: failed to query keyboard focus property, errno=%d", errno);
|
||||
|
||||
QWindow *focusWindow = QQnxIntegration::window(window);
|
||||
|
||||
@ -581,7 +581,7 @@ void QQnxWindow::setFocus(screen_window_t newFocusWindow)
|
||||
screen_get_window_property_pv(nativeHandle(), SCREEN_PROPERTY_GROUP,
|
||||
reinterpret_cast<void**>(&screenGroup));
|
||||
if (screenGroup) {
|
||||
screen_set_group_property_pv(screenGroup, SCREEN_PROPERTY_KEYBOARD_FOCUS,
|
||||
screen_set_group_property_pv(screenGroup, SCREEN_PROPERTY_FOCUS,
|
||||
reinterpret_cast<void**>(&newFocusWindow));
|
||||
}
|
||||
}
|
||||
|
||||
@ -828,7 +828,7 @@ void QWinRTScreen::addWindow(QWindow *window)
|
||||
}
|
||||
|
||||
handleExpose();
|
||||
QWindowSystemInterface::flushWindowSystemEvents();
|
||||
QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents);
|
||||
|
||||
#if _MSC_VER >= 1900 && !defined(QT_NO_DRAGANDDROP)
|
||||
QWinRTDrag::instance()->setDropTarget(window);
|
||||
@ -848,7 +848,7 @@ void QWinRTScreen::removeWindow(QWindow *window)
|
||||
if (wasTopWindow && type != Qt::Popup && type != Qt::ToolTip && type != Qt::Tool)
|
||||
QWindowSystemInterface::handleWindowActivated(Q_NULLPTR, Qt::OtherFocusReason);
|
||||
handleExpose();
|
||||
QWindowSystemInterface::flushWindowSystemEvents();
|
||||
QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents);
|
||||
#if _MSC_VER >= 1900 && !defined(QT_NO_DRAGANDDROP)
|
||||
if (wasTopWindow)
|
||||
QWinRTDrag::instance()->setDropTarget(topWindow());
|
||||
@ -1157,6 +1157,12 @@ HRESULT QWinRTScreen::onPointerUpdated(ICoreWindow *, IPointerEventArgs *args)
|
||||
properties->get_IsLeftButtonPressed(&isPressed); // IsInContact not reliable on phone
|
||||
#endif
|
||||
|
||||
// Devices like the Hololens set a static pressure of 0.5 independent
|
||||
// of the pressed state. In those cases we need to synthesize the
|
||||
// pressure value. To our knowledge this does not apply to pens
|
||||
if (pointerDeviceType == PointerDeviceType_Touch && pressure == 0.5f)
|
||||
pressure = isPressed ? 1. : 0.;
|
||||
|
||||
const QRectF areaRect(area.X * d->scaleFactor, area.Y * d->scaleFactor,
|
||||
area.Width * d->scaleFactor, area.Height * d->scaleFactor);
|
||||
|
||||
|
||||
@ -992,6 +992,9 @@ void QXcbDrag::handleDrop(QPlatformWindow *, const xcb_client_message_event_t *e
|
||||
} else {
|
||||
dropData = platformDropData();
|
||||
supported_drop_actions = accepted_drop_action;
|
||||
|
||||
// Drop coming from another app? Update keyboard modifiers.
|
||||
QGuiApplicationPrivate::modifier_buttons = QGuiApplication::queryKeyboardModifiers();
|
||||
}
|
||||
|
||||
if (!dropData)
|
||||
|
||||
@ -1393,10 +1393,11 @@ void QXcbKeyboard::resolveMaskConflicts()
|
||||
class KeyChecker
|
||||
{
|
||||
public:
|
||||
KeyChecker(xcb_window_t window, xcb_keycode_t code, xcb_timestamp_t time)
|
||||
KeyChecker(xcb_window_t window, xcb_keycode_t code, xcb_timestamp_t time, quint16 state)
|
||||
: m_window(window)
|
||||
, m_code(code)
|
||||
, m_time(time)
|
||||
, m_state(state)
|
||||
, m_error(false)
|
||||
, m_release(true)
|
||||
{
|
||||
@ -1413,7 +1414,7 @@ public:
|
||||
|
||||
xcb_key_press_event_t *event = (xcb_key_press_event_t *)ev;
|
||||
|
||||
if (event->event != m_window || event->detail != m_code) {
|
||||
if (event->event != m_window || event->detail != m_code || event->state != m_state) {
|
||||
m_error = true;
|
||||
return false;
|
||||
}
|
||||
@ -1441,6 +1442,7 @@ private:
|
||||
xcb_window_t m_window;
|
||||
xcb_keycode_t m_code;
|
||||
xcb_timestamp_t m_time;
|
||||
quint16 m_state;
|
||||
|
||||
bool m_error;
|
||||
bool m_release;
|
||||
@ -1505,7 +1507,7 @@ void QXcbKeyboard::handleKeyEvent(xcb_window_t sourceWindow, QEvent::Type type,
|
||||
}
|
||||
} else {
|
||||
// look ahead for auto-repeat
|
||||
KeyChecker checker(source->xcb_window(), code, time);
|
||||
KeyChecker checker(source->xcb_window(), code, time, state);
|
||||
xcb_generic_event_t *event = connection()->checkEvent(checker);
|
||||
if (event) {
|
||||
isAutoRepeat = true;
|
||||
|
||||
@ -2541,8 +2541,13 @@ void QXcbWindow::handlePropertyNotifyEvent(const xcb_property_notify_event_t *ev
|
||||
|
||||
if (reply && reply->format == 32 && reply->type == atom(QXcbAtom::WM_STATE)) {
|
||||
const quint32 *data = (const quint32 *)xcb_get_property_value(reply);
|
||||
if (reply->length != 0 && XCB_WM_STATE_ICONIC == data[0])
|
||||
newState = Qt::WindowMinimized;
|
||||
if (reply->length != 0) {
|
||||
if (data[0] == XCB_WM_STATE_ICONIC
|
||||
|| (data[0] == XCB_WM_STATE_WITHDRAWN
|
||||
&& m_lastWindowStateEvent == Qt::WindowMinimized)) {
|
||||
newState = Qt::WindowMinimized;
|
||||
}
|
||||
}
|
||||
}
|
||||
free(reply);
|
||||
} else { // _NET_WM_STATE can't change minimized state
|
||||
|
||||
@ -640,8 +640,15 @@ QVariant QMYSQLResult::data(int field)
|
||||
if (f.nullIndicator)
|
||||
return QVariant(f.type);
|
||||
|
||||
if (qIsInteger(f.type))
|
||||
return QVariant(f.type, f.outField);
|
||||
if (qIsInteger(f.type)) {
|
||||
QVariant variant(f.type, f.outField);
|
||||
// we never want to return char variants here, see QTBUG-53397
|
||||
if (static_cast<int>(f.type) == QMetaType::UChar)
|
||||
return variant.toUInt();
|
||||
else if (static_cast<int>(f.type) == QMetaType::Char)
|
||||
return variant.toInt();
|
||||
return variant;
|
||||
}
|
||||
|
||||
if (f.type != QVariant::ByteArray)
|
||||
val = toUnicode(d->drv_d_func()->tc, f.outField, f.bufLength);
|
||||
@ -1371,7 +1378,7 @@ bool QMYSQLDriver::open(const QString& db,
|
||||
: sslCipher.toLocal8Bit().constData());
|
||||
}
|
||||
|
||||
#if MYSQL_VERSION_ID >= 50000
|
||||
#if MYSQL_VERSION_ID >= 50100
|
||||
if (connectTimeout != 0)
|
||||
mysql_options(d->mysql, MYSQL_OPT_CONNECT_TIMEOUT, &connectTimeout);
|
||||
if (readTimeout != 0)
|
||||
@ -1400,7 +1407,7 @@ bool QMYSQLDriver::open(const QString& db,
|
||||
setOpenError(true);
|
||||
return false;
|
||||
}
|
||||
#if MYSQL_VERSION_ID >= 50000
|
||||
#if MYSQL_VERSION_ID >= 50100
|
||||
if (reconnect)
|
||||
mysql_options(d->mysql, MYSQL_OPT_RECONNECT, &reconnect);
|
||||
#endif
|
||||
|
||||
@ -283,6 +283,8 @@ QWidgetPrivate::QWidgetPrivate(int version)
|
||||
, renderToTextureReallyDirty(1)
|
||||
, renderToTextureComposeActive(0)
|
||||
#endif
|
||||
, childrenHiddenByWState(0)
|
||||
, childrenShownByExpose(0)
|
||||
#if defined(Q_OS_WIN)
|
||||
, noPaintOnScreen(0)
|
||||
#endif
|
||||
@ -9026,13 +9028,23 @@ bool QWidget::event(QEvent *event)
|
||||
case QEvent::WindowStateChange: {
|
||||
const bool wasMinimized = static_cast<const QWindowStateChangeEvent *>(event)->oldState() & Qt::WindowMinimized;
|
||||
if (wasMinimized != isMinimized()) {
|
||||
QWidget *widget = const_cast<QWidget *>(this);
|
||||
if (wasMinimized) {
|
||||
QShowEvent showEvent;
|
||||
QCoreApplication::sendEvent(const_cast<QWidget *>(this), &showEvent);
|
||||
// Always send the spontaneous events here, otherwise it can break the application!
|
||||
if (!d->childrenShownByExpose) {
|
||||
// Show widgets only when they are not yet shown by the expose event
|
||||
d->showChildren(true);
|
||||
QShowEvent showEvent;
|
||||
QCoreApplication::sendSpontaneousEvent(widget, &showEvent);
|
||||
}
|
||||
d->childrenHiddenByWState = false; // Set it always to "false" when window is restored
|
||||
} else {
|
||||
QHideEvent hideEvent;
|
||||
QCoreApplication::sendEvent(const_cast<QWidget *>(this), &hideEvent);
|
||||
QCoreApplication::sendSpontaneousEvent(widget, &hideEvent);
|
||||
d->hideChildren(true);
|
||||
d->childrenHiddenByWState = true;
|
||||
}
|
||||
d->childrenShownByExpose = false; // Set it always to "false" when window state changes
|
||||
}
|
||||
changeEvent(event);
|
||||
}
|
||||
|
||||
@ -753,6 +753,8 @@ public:
|
||||
uint renderToTextureReallyDirty : 1;
|
||||
uint renderToTextureComposeActive : 1;
|
||||
#endif
|
||||
uint childrenHiddenByWState : 1;
|
||||
uint childrenShownByExpose : 1;
|
||||
|
||||
// *************************** Platform specific ************************************
|
||||
#if defined(Q_OS_WIN)
|
||||
|
||||
@ -387,7 +387,14 @@ void QWidgetWindow::handleEnterLeaveEvent(QEvent *event)
|
||||
const QEnterEvent *ee = static_cast<QEnterEvent *>(event);
|
||||
QWidget *child = m_widget->childAt(ee->pos());
|
||||
QWidget *receiver = child ? child : m_widget.data();
|
||||
QApplicationPrivate::dispatchEnterLeave(receiver, 0, ee->screenPos());
|
||||
QWidget *leave = Q_NULLPTR;
|
||||
if (QApplicationPrivate::inPopupMode() && receiver == m_widget
|
||||
&& qt_last_mouse_receiver != m_widget) {
|
||||
// This allows to deliver the leave event to the native widget
|
||||
// action on first-level menu.
|
||||
leave = qt_last_mouse_receiver;
|
||||
}
|
||||
QApplicationPrivate::dispatchEnterLeave(receiver, leave, ee->screenPos());
|
||||
qt_last_mouse_receiver = receiver;
|
||||
}
|
||||
}
|
||||
@ -477,34 +484,31 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
|
||||
receiver = popupChild;
|
||||
if (receiver != activePopupWidget)
|
||||
widgetPos = receiver->mapFromGlobal(event->globalPos());
|
||||
QWidget *alien = receiver;
|
||||
|
||||
#if !defined(Q_OS_OSX) && !defined(Q_OS_IOS) // Cocoa tracks popups
|
||||
const bool reallyUnderMouse = activePopupWidget->rect().contains(mapped);
|
||||
const bool underMouse = activePopupWidget->underMouse();
|
||||
if (activePopupWidget != m_widget || (!underMouse && qt_button_down)) {
|
||||
// If active popup menu is not the first-level popup menu then we must emulate enter/leave events,
|
||||
// because first-level popup menu grabs the mouse and enter/leave events are delivered only to it
|
||||
// by QPA. Make an exception for first-level popup menu when the mouse button is pressed on widget.
|
||||
if (underMouse != reallyUnderMouse) {
|
||||
if (reallyUnderMouse) {
|
||||
if (underMouse != reallyUnderMouse) {
|
||||
if (reallyUnderMouse) {
|
||||
const QPoint receiverMapped = receiver->mapFromGlobal(event->screenPos().toPoint());
|
||||
// Prevent negative mouse position on enter event - this event
|
||||
// should be properly handled in "handleEnterLeaveEvent()".
|
||||
if (receiverMapped.x() >= 0 && receiverMapped.y() >= 0) {
|
||||
QApplicationPrivate::dispatchEnterLeave(receiver, Q_NULLPTR, event->screenPos());
|
||||
qt_last_mouse_receiver = receiver;
|
||||
} else {
|
||||
QApplicationPrivate::dispatchEnterLeave(Q_NULLPTR, qt_last_mouse_receiver, event->screenPos());
|
||||
qt_last_mouse_receiver = receiver;
|
||||
receiver = activePopupWidget;
|
||||
}
|
||||
} else {
|
||||
QApplicationPrivate::dispatchEnterLeave(Q_NULLPTR, qt_last_mouse_receiver, event->screenPos());
|
||||
qt_last_mouse_receiver = receiver;
|
||||
receiver = activePopupWidget;
|
||||
}
|
||||
} else if (!reallyUnderMouse) {
|
||||
alien = Q_NULLPTR;
|
||||
}
|
||||
#endif
|
||||
|
||||
QMouseEvent e(event->type(), widgetPos, event->windowPos(), event->screenPos(),
|
||||
event->button(), event->buttons(), event->modifiers(), event->source());
|
||||
e.setTimestamp(event->timestamp());
|
||||
QApplicationPrivate::sendMouseEvent(receiver, &e, alien, receiver->window(), &qt_button_down, qt_last_mouse_receiver);
|
||||
QApplicationPrivate::sendMouseEvent(receiver, &e, receiver, receiver->window(), &qt_button_down, qt_last_mouse_receiver);
|
||||
qt_last_mouse_receiver = receiver;
|
||||
} else {
|
||||
// close disabled popups when a mouse button is pressed or released
|
||||
@ -881,10 +885,40 @@ void QWidgetWindow::handleDropEvent(QDropEvent *event)
|
||||
|
||||
void QWidgetWindow::handleExposeEvent(QExposeEvent *event)
|
||||
{
|
||||
if (isExposed()) {
|
||||
QWidgetPrivate *wPriv = m_widget->d_func();
|
||||
const bool exposed = isExposed();
|
||||
|
||||
if (wPriv->childrenHiddenByWState) {
|
||||
// If widgets has been previously hidden by window state change event
|
||||
// and they aren't yet shown...
|
||||
if (exposed) {
|
||||
// If the window becomes exposed...
|
||||
if (!wPriv->childrenShownByExpose) {
|
||||
// ... and they haven't been shown by this function yet - show it.
|
||||
wPriv->showChildren(true);
|
||||
QShowEvent showEvent;
|
||||
QCoreApplication::sendSpontaneousEvent(m_widget, &showEvent);
|
||||
wPriv->childrenShownByExpose = true;
|
||||
}
|
||||
} else {
|
||||
// If the window becomes not exposed...
|
||||
if (wPriv->childrenShownByExpose) {
|
||||
// ... and child widgets was previously shown by the expose event - hide widgets again.
|
||||
// This is a workaround, because sometimes when window is minimized programatically,
|
||||
// the QPA can notify that the window is exposed after changing window state to minimized
|
||||
// and then, the QPA can send next expose event with null exposed region (not exposed).
|
||||
wPriv->hideChildren(true);
|
||||
QHideEvent hideEvent;
|
||||
QCoreApplication::sendSpontaneousEvent(m_widget, &hideEvent);
|
||||
wPriv->childrenShownByExpose = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (exposed) {
|
||||
m_widget->setAttribute(Qt::WA_Mapped);
|
||||
if (!event->region().isNull())
|
||||
m_widget->d_func()->syncBackingStore(event->region());
|
||||
wPriv->syncBackingStore(event->region());
|
||||
} else {
|
||||
m_widget->setAttribute(Qt::WA_Mapped, false);
|
||||
}
|
||||
|
||||
@ -671,7 +671,7 @@ T qstyleoption_cast(const QStyleOption *opt)
|
||||
|| (int(Opt::Type) == QStyleOption::SO_Complex
|
||||
&& opt->type > QStyleOption::SO_Complex)))
|
||||
return static_cast<T>(opt);
|
||||
return 0;
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
@ -683,7 +683,7 @@ T qstyleoption_cast(QStyleOption *opt)
|
||||
|| (int(Opt::Type) == QStyleOption::SO_Complex
|
||||
&& opt->type > QStyleOption::SO_Complex)))
|
||||
return static_cast<T>(opt);
|
||||
return 0;
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
// -------------------------- QStyleHintReturn -------------------------------
|
||||
@ -732,7 +732,7 @@ T qstyleoption_cast(const QStyleHintReturn *hint)
|
||||
if (hint && hint->version <= Opt::Version &&
|
||||
(hint->type == Opt::Type || int(Opt::Type) == QStyleHintReturn::SH_Default))
|
||||
return static_cast<T>(hint);
|
||||
return 0;
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
@ -742,7 +742,7 @@ T qstyleoption_cast(QStyleHintReturn *hint)
|
||||
if (hint && hint->version <= Opt::Version &&
|
||||
(hint->type == Opt::Type || int(Opt::Type) == QStyleHintReturn::SH_Default))
|
||||
return static_cast<T>(hint);
|
||||
return 0;
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
#if !defined(QT_NO_DEBUG_STREAM)
|
||||
|
||||
@ -76,22 +76,6 @@
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QMenu *QMenuPrivate::mouseDown = 0;
|
||||
QPointer<QMenu> QMenuPrivate::previousMouseMenu(Q_NULLPTR);
|
||||
static void handleEnterLeaveEvents(QPointer<QMenu> *previous_ptr, QMenu *next)
|
||||
{
|
||||
QWidget *previous = previous_ptr->data();
|
||||
if (previous != next) {
|
||||
if (previous) {
|
||||
QEvent leaveEvent(QEvent::Leave);
|
||||
QApplication::sendEvent(previous, &leaveEvent);
|
||||
}
|
||||
if (next) {
|
||||
QEvent enterEvent(QEvent::Enter);
|
||||
QApplication::sendEvent(next, &enterEvent);
|
||||
}
|
||||
}
|
||||
*previous_ptr = next;
|
||||
}
|
||||
|
||||
/* QMenu code */
|
||||
// internal class used for the torn off popup
|
||||
@ -510,8 +494,6 @@ void QMenuPrivate::hideMenu(QMenu *menu)
|
||||
menu->d_func()->causedPopup.action = 0;
|
||||
menu->close();
|
||||
menu->d_func()->causedPopup.widget = 0;
|
||||
if (previousMouseMenu.data() == menu)
|
||||
handleEnterLeaveEvents(&previousMouseMenu, Q_NULLPTR);
|
||||
}
|
||||
|
||||
void QMenuPrivate::popupAction(QAction *action, int delay, bool activateFirst)
|
||||
@ -677,10 +659,26 @@ void QMenuSloppyState::enter()
|
||||
m_parent->childEnter();
|
||||
}
|
||||
|
||||
void QMenuSloppyState::childEnter()
|
||||
{
|
||||
stopTimer();
|
||||
if (m_parent)
|
||||
m_parent->childEnter();
|
||||
}
|
||||
|
||||
void QMenuSloppyState::leave()
|
||||
{
|
||||
if (!m_dont_start_time_on_leave) {
|
||||
if (m_parent)
|
||||
m_parent->childLeave();
|
||||
startTimerIfNotRunning();
|
||||
}
|
||||
}
|
||||
|
||||
void QMenuSloppyState::childLeave()
|
||||
{
|
||||
if (m_enabled && !QMenuPrivate::get(m_menu)->hasReceievedEnter) {
|
||||
startTimer();
|
||||
startTimerIfNotRunning();
|
||||
if (m_parent)
|
||||
m_parent->childLeave();
|
||||
}
|
||||
@ -726,8 +724,17 @@ public:
|
||||
void QMenuSloppyState::timeout()
|
||||
{
|
||||
QMenuPrivate *menu_priv = QMenuPrivate::get(m_menu);
|
||||
|
||||
bool reallyHasMouse = menu_priv->hasReceievedEnter;
|
||||
if (!reallyHasMouse) {
|
||||
// Check whether the menu really has a mouse, because only active popup
|
||||
// menu gets the enter/leave events. Currently Cocoa is an exception.
|
||||
const QPoint lastCursorPos = QGuiApplicationPrivate::lastCursorPosition.toPoint();
|
||||
reallyHasMouse = m_menu->frameGeometry().contains(lastCursorPos);
|
||||
}
|
||||
|
||||
if (menu_priv->currentAction == m_reset_action
|
||||
&& menu_priv->hasReceievedEnter
|
||||
&& reallyHasMouse
|
||||
&& (menu_priv->currentAction
|
||||
&& menu_priv->currentAction->menu() == menu_priv->activeMenu)) {
|
||||
return;
|
||||
@ -735,13 +742,13 @@ void QMenuSloppyState::timeout()
|
||||
|
||||
ResetOnDestroy resetState(this, &m_init_guard);
|
||||
|
||||
if (hasParentActiveDelayTimer() || !m_menu || !m_menu->isVisible())
|
||||
if (hasParentActiveDelayTimer() || !m_menu->isVisible())
|
||||
return;
|
||||
|
||||
if (m_sub_menu)
|
||||
menu_priv->hideMenu(m_sub_menu);
|
||||
|
||||
if (menu_priv->hasReceievedEnter)
|
||||
if (reallyHasMouse)
|
||||
menu_priv->setCurrentAction(m_reset_action,0);
|
||||
else
|
||||
menu_priv->setCurrentAction(Q_NULLPTR, 0);
|
||||
@ -1095,10 +1102,8 @@ bool QMenuPrivate::mouseEventTaken(QMouseEvent *e)
|
||||
tearoffHighlighted = 0;
|
||||
}
|
||||
|
||||
if (q->frameGeometry().contains(e->globalPos())) { //otherwise if the event is in our rect we want it..
|
||||
handleEnterLeaveEvents(&previousMouseMenu, q);
|
||||
return false;
|
||||
}
|
||||
if (q->frameGeometry().contains(e->globalPos()))
|
||||
return false; //otherwise if the event is in our rect we want it..
|
||||
|
||||
for(QWidget *caused = causedPopup.widget; caused;) {
|
||||
bool passOnEvent = false;
|
||||
@ -1114,17 +1119,16 @@ bool QMenuPrivate::mouseEventTaken(QMouseEvent *e)
|
||||
next_widget = m->d_func()->causedPopup.widget;
|
||||
}
|
||||
if (passOnEvent) {
|
||||
handleEnterLeaveEvents(&previousMouseMenu,qobject_cast<QMenu *>(caused));
|
||||
if(e->type() != QEvent::MouseButtonRelease || mouseDown == caused) {
|
||||
QMouseEvent new_e(e->type(), cpos, caused->mapTo(caused->topLevelWidget(), cpos), e->screenPos(),
|
||||
e->button(), e->buttons(), e->modifiers(), e->source());
|
||||
QApplication::sendEvent(caused, &new_e);
|
||||
return true;
|
||||
if (e->type() != QEvent::MouseButtonRelease || mouseDown == caused) {
|
||||
QMouseEvent new_e(e->type(), cpos, caused->mapTo(caused->topLevelWidget(), cpos), e->screenPos(),
|
||||
e->button(), e->buttons(), e->modifiers(), e->source());
|
||||
QApplication::sendEvent(caused, &new_e);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
caused = next_widget;
|
||||
if (!caused)
|
||||
handleEnterLeaveEvents(&previousMouseMenu, Q_NULLPTR);
|
||||
sloppyState.leave(); // Start timers
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -3218,7 +3222,6 @@ void QMenu::enterEvent(QEvent *)
|
||||
Q_D(QMenu);
|
||||
d->hasReceievedEnter = true;
|
||||
d->sloppyState.enter();
|
||||
d->sloppyState.startTimer();
|
||||
d->motions = -1; // force us to ignore the generate mouse move in mouseMoveEvent()
|
||||
}
|
||||
|
||||
@ -3229,7 +3232,6 @@ void QMenu::leaveEvent(QEvent *)
|
||||
{
|
||||
Q_D(QMenu);
|
||||
d->hasReceievedEnter = false;
|
||||
d->sloppyState.leave();
|
||||
if (!d->activeMenu && d->currentAction)
|
||||
setActiveAction(0);
|
||||
}
|
||||
@ -3393,10 +3395,18 @@ void QMenu::internalDelayedPopup()
|
||||
const QRect actionRect(d->actionRect(d->currentAction));
|
||||
const QPoint rightPos(mapToGlobal(QPoint(actionRect.right() + subMenuOffset + 1, actionRect.top())));
|
||||
|
||||
QPoint pos(rightPos);
|
||||
|
||||
d->activeMenu->popup(pos);
|
||||
d->activeMenu->popup(rightPos);
|
||||
d->sloppyState.setSubMenuPopup(actionRect, d->currentAction, d->activeMenu);
|
||||
|
||||
#if !defined(Q_OS_DARWIN)
|
||||
// Send the leave event to the current menu - only active popup menu gets
|
||||
// mouse enter/leave events. Currently Cocoa is an exception, so disable
|
||||
// it there to avoid event duplication.
|
||||
if (underMouse()) {
|
||||
QEvent leaveEvent(QEvent::Leave);
|
||||
QCoreApplication::sendEvent(this, &leaveEvent);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
@ -120,8 +120,6 @@ public:
|
||||
void reset();
|
||||
bool enabled() const { return m_enabled; }
|
||||
|
||||
void setResetAction(QAction *action) { m_reset_action = action; }
|
||||
|
||||
enum MouseEventResult {
|
||||
EventIsProcessed,
|
||||
EventShouldBePropagated,
|
||||
@ -146,22 +144,9 @@ public:
|
||||
}
|
||||
|
||||
void enter();
|
||||
void childEnter();
|
||||
|
||||
void childEnter()
|
||||
{
|
||||
stopTimer();
|
||||
if (m_parent)
|
||||
m_parent->childEnter();
|
||||
}
|
||||
|
||||
void leave()
|
||||
{
|
||||
if (m_dont_start_time_on_leave)
|
||||
return;
|
||||
if (m_parent)
|
||||
m_parent->childLeave();
|
||||
startTimer();
|
||||
}
|
||||
void leave();
|
||||
void childLeave();
|
||||
|
||||
static float slope(const QPointF &p1, const QPointF &p2)
|
||||
@ -187,8 +172,7 @@ public:
|
||||
if (!m_enabled)
|
||||
return EventShouldBePropagated;
|
||||
|
||||
if (!m_time.isActive())
|
||||
startTimer();
|
||||
startTimerIfNotRunning();
|
||||
|
||||
if (!m_sub_menu) {
|
||||
reset();
|
||||
@ -460,7 +444,6 @@ public:
|
||||
QPointer<QAction> actionAboutToTrigger;
|
||||
|
||||
QPointer<QWidget> noReplayFor;
|
||||
static QPointer<QMenu> previousMouseMenu;
|
||||
};
|
||||
|
||||
#endif // QT_NO_MENU
|
||||
|
||||
@ -612,9 +612,10 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
|
||||
for items in the menu bar are only shown when the \uicontrol{Alt} key is
|
||||
pressed.
|
||||
|
||||
\section1 QMenuBar on \macos
|
||||
\section1 QMenuBar as a Global Menu Bar
|
||||
|
||||
QMenuBar on \macos is a wrapper for using the system-wide menu bar.
|
||||
On \macos and on certain Linux desktop environments such as
|
||||
Ubuntu Unity, QMenuBar is a wrapper for using the system-wide menu bar.
|
||||
If you have multiple menu bars in one dialog the outermost menu bar
|
||||
(normally inside a widget with widget flag Qt::Window) will
|
||||
be used for the system-wide menu bar.
|
||||
@ -657,11 +658,16 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
|
||||
as its parent. That menu bar would only be displayed for the
|
||||
parent QMainWindow.
|
||||
|
||||
\b{Note:} The text used for the application name in the menu
|
||||
\b{Note:} The text used for the application name in the \macos menu
|
||||
bar is obtained from the value set in the \c{Info.plist} file in
|
||||
the application's bundle. See \l{Qt for macOS - Deployment}
|
||||
for more information.
|
||||
|
||||
\b{Note:} On Linux, if the com.canonical.AppMenu.Registrar
|
||||
service is available on the D-Bus session bus, then Qt will
|
||||
communicate with it to install the application's menus into the
|
||||
global menu bar, as described.
|
||||
|
||||
\section1 Examples
|
||||
|
||||
The \l{mainwindows/menus}{Menus} example shows how to use QMenuBar
|
||||
@ -985,13 +991,11 @@ void QMenuBar::paintEvent(QPaintEvent *e)
|
||||
*/
|
||||
void QMenuBar::setVisible(bool visible)
|
||||
{
|
||||
#if defined(Q_OS_DARWIN)
|
||||
if (isNativeMenuBar()) {
|
||||
if (!visible)
|
||||
QWidget::setVisible(false);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
QWidget::setVisible(visible);
|
||||
}
|
||||
|
||||
@ -1534,11 +1538,7 @@ QRect QMenuBar::actionGeometry(QAction *act) const
|
||||
QSize QMenuBar::minimumSizeHint() const
|
||||
{
|
||||
Q_D(const QMenuBar);
|
||||
#if defined(Q_OS_DARWIN)
|
||||
const bool as_gui_menubar = !isNativeMenuBar();
|
||||
#else
|
||||
const bool as_gui_menubar = true;
|
||||
#endif
|
||||
|
||||
ensurePolished();
|
||||
QSize ret(0, 0);
|
||||
@ -1590,12 +1590,7 @@ QSize QMenuBar::minimumSizeHint() const
|
||||
QSize QMenuBar::sizeHint() const
|
||||
{
|
||||
Q_D(const QMenuBar);
|
||||
#if defined(Q_OS_DARWIN)
|
||||
const bool as_gui_menubar = !isNativeMenuBar();
|
||||
#else
|
||||
const bool as_gui_menubar = true;
|
||||
#endif
|
||||
|
||||
|
||||
ensurePolished();
|
||||
QSize ret(0, 0);
|
||||
@ -1648,11 +1643,7 @@ QSize QMenuBar::sizeHint() const
|
||||
int QMenuBar::heightForWidth(int) const
|
||||
{
|
||||
Q_D(const QMenuBar);
|
||||
#if defined(Q_OS_DARWIN)
|
||||
const bool as_gui_menubar = !isNativeMenuBar();
|
||||
#else
|
||||
const bool as_gui_menubar = true;
|
||||
#endif
|
||||
|
||||
const_cast<QMenuBarPrivate*>(d)->updateGeometries();
|
||||
int height = 0;
|
||||
@ -1783,23 +1774,23 @@ QWidget *QMenuBar::cornerWidget(Qt::Corner corner) const
|
||||
\brief Whether or not a menubar will be used as a native menubar on platforms that support it
|
||||
\since 4.6
|
||||
|
||||
This property specifies whether or not the menubar should be used as a native menubar on \macos.
|
||||
This property specifies whether or not the menubar should be used as a native menubar on
|
||||
platforms that support it. The currently supported platforms are \macos, and
|
||||
Linux desktops which use the com.canonical.dbusmenu D-Bus interface (such as Ubuntu Unity).
|
||||
If this property is \c true, the menubar is used in the native menubar and is not in the window of
|
||||
its parent, if \c false the menubar remains in the window. On other platforms the value of this
|
||||
attribute has no effect.
|
||||
its parent; if \c false the menubar remains in the window. On other platforms,
|
||||
setting this attribute has no effect, and reading this attribute will always return \c false.
|
||||
|
||||
The default is to follow whether the Qt::AA_DontUseNativeMenuBar attribute
|
||||
is set for the application. Explicitly settings this property overrides
|
||||
the presence (or abscence) of the attribute.
|
||||
is set for the application. Explicitly setting this property overrides
|
||||
the presence (or absence) of the attribute.
|
||||
*/
|
||||
|
||||
void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
|
||||
{
|
||||
Q_D(QMenuBar);
|
||||
if (d->nativeMenuBar == -1 || (nativeMenuBar != bool(d->nativeMenuBar))) {
|
||||
d->nativeMenuBar = nativeMenuBar;
|
||||
|
||||
if (!d->nativeMenuBar) {
|
||||
if (nativeMenuBar != bool(d->platformMenuBar)) {
|
||||
if (!nativeMenuBar) {
|
||||
delete d->platformMenuBar;
|
||||
d->platformMenuBar = 0;
|
||||
} else {
|
||||
@ -1808,7 +1799,7 @@ void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
|
||||
}
|
||||
|
||||
updateGeometry();
|
||||
if (!d->nativeMenuBar && parentWidget())
|
||||
if (!nativeMenuBar && parentWidget())
|
||||
setVisible(true);
|
||||
}
|
||||
}
|
||||
@ -1816,10 +1807,7 @@ void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
|
||||
bool QMenuBar::isNativeMenuBar() const
|
||||
{
|
||||
Q_D(const QMenuBar);
|
||||
if (d->nativeMenuBar == -1) {
|
||||
return !QApplication::instance()->testAttribute(Qt::AA_DontUseNativeMenuBar);
|
||||
}
|
||||
return d->nativeMenuBar;
|
||||
return bool(d->platformMenuBar);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
@ -66,7 +66,7 @@ class QMenuBarPrivate : public QWidgetPrivate
|
||||
public:
|
||||
QMenuBarPrivate() : itemsDirty(0), currentAction(0), mouseDown(0),
|
||||
closePopupMode(0), defaultPopDown(1), popupState(0), keyboardState(0), altPressed(0),
|
||||
nativeMenuBar(-1), doChildEffects(false), platformMenuBar(0)
|
||||
doChildEffects(false), platformMenuBar(0)
|
||||
{ }
|
||||
|
||||
~QMenuBarPrivate()
|
||||
@ -103,8 +103,6 @@ public:
|
||||
uint keyboardState : 1, altPressed : 1;
|
||||
QPointer<QWidget> keyboardFocusWidget;
|
||||
|
||||
|
||||
int nativeMenuBar : 3; // Only has values -1, 0, and 1
|
||||
//firing of events
|
||||
void activateAction(QAction *, QAction::ActionEvent);
|
||||
|
||||
|
||||
@ -1958,9 +1958,8 @@ void QTabBar::mouseMoveEvent(QMouseEvent *event)
|
||||
}
|
||||
}
|
||||
|
||||
int offset = (event->pos() - d->dragStartPosition).manhattanLength();
|
||||
if (event->buttons() == Qt::LeftButton
|
||||
&& offset > QApplication::startDragDistance()
|
||||
&& d->dragInProgress
|
||||
&& d->validIndex(d->pressedIndex)) {
|
||||
bool vertical = verticalTabs(d->shape);
|
||||
int dragDistance;
|
||||
|
||||
@ -196,7 +196,6 @@ QToolButton::QToolButton(QWidget * parent)
|
||||
void QToolButtonPrivate::init()
|
||||
{
|
||||
Q_Q(QToolButton);
|
||||
delay = q->style()->styleHint(QStyle::SH_ToolButton_PopupDelay, 0, q);
|
||||
defaultAction = 0;
|
||||
#ifndef QT_NO_TOOLBAR
|
||||
if (qobject_cast<QToolBar*>(parent))
|
||||
@ -222,7 +221,7 @@ void QToolButtonPrivate::init()
|
||||
#endif
|
||||
|
||||
setLayoutItemMargins(QStyle::SE_ToolButtonLayoutItem);
|
||||
|
||||
delay = q->style()->styleHint(QStyle::SH_ToolButton_PopupDelay, 0, q);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
@ -198,6 +198,14 @@ public:
|
||||
|
||||
private:
|
||||
HRESULT activatedLaunch(IInspectable *activateArgs) {
|
||||
// Check if an application instance is already running
|
||||
// This is mostly needed for Windows Phone and file pickers
|
||||
QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher();
|
||||
if (dispatcher) {
|
||||
QCoreApplication::postEvent(dispatcher, new QActivationEvent(activateArgs));
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
QCoreApplication *app = QCoreApplication::instance();
|
||||
|
||||
// Check whether the app already runs
|
||||
|
||||
@ -30,6 +30,15 @@
|
||||
|
||||
#include <QString>
|
||||
|
||||
// Preserve QLatin1String-ness (QVariant(QLatin1String) creates a QVariant::String):
|
||||
struct QLatin1StringContainer {
|
||||
QLatin1String l1;
|
||||
};
|
||||
QT_BEGIN_NAMESPACE
|
||||
Q_DECLARE_TYPEINFO(QLatin1StringContainer, Q_MOVABLE_TYPE);
|
||||
QT_END_NAMESPACE
|
||||
Q_DECLARE_METATYPE(QLatin1StringContainer)
|
||||
|
||||
class tst_QLatin1String : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@ -39,6 +48,8 @@ private Q_SLOTS:
|
||||
void midLeftRight();
|
||||
void nullString();
|
||||
void emptyString();
|
||||
void relationalOperators_data();
|
||||
void relationalOperators();
|
||||
};
|
||||
|
||||
|
||||
@ -144,7 +155,53 @@ void tst_QLatin1String::emptyString()
|
||||
}
|
||||
}
|
||||
|
||||
void tst_QLatin1String::relationalOperators_data()
|
||||
{
|
||||
QTest::addColumn<QLatin1StringContainer>("lhs");
|
||||
QTest::addColumn<int>("lhsOrderNumber");
|
||||
QTest::addColumn<QLatin1StringContainer>("rhs");
|
||||
QTest::addColumn<int>("rhsOrderNumber");
|
||||
|
||||
struct Data {
|
||||
QLatin1String l1;
|
||||
int order;
|
||||
} data[] = {
|
||||
{ QLatin1String(), 0 },
|
||||
{ QLatin1String(""), 0 },
|
||||
{ QLatin1String("a"), 1 },
|
||||
{ QLatin1String("aa"), 2 },
|
||||
{ QLatin1String("b"), 3 },
|
||||
};
|
||||
|
||||
for (Data *lhs = data; lhs != data + sizeof data / sizeof *data; ++lhs) {
|
||||
for (Data *rhs = data; rhs != data + sizeof data / sizeof *data; ++rhs) {
|
||||
QLatin1StringContainer l = { lhs->l1 }, r = { rhs->l1 };
|
||||
QTest::newRow(qPrintable(QString::asprintf("\"%s\" <> \"%s\"",
|
||||
lhs->l1.data() ? lhs->l1.data() : "nullptr",
|
||||
rhs->l1.data() ? rhs->l1.data() : "nullptr")))
|
||||
<< l << lhs->order << r << rhs->order;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void tst_QLatin1String::relationalOperators()
|
||||
{
|
||||
QFETCH(QLatin1StringContainer, lhs);
|
||||
QFETCH(int, lhsOrderNumber);
|
||||
QFETCH(QLatin1StringContainer, rhs);
|
||||
QFETCH(int, rhsOrderNumber);
|
||||
|
||||
#define CHECK(op) \
|
||||
QCOMPARE(lhs.l1 op rhs.l1, lhsOrderNumber op rhsOrderNumber) \
|
||||
/*end*/
|
||||
CHECK(==);
|
||||
CHECK(!=);
|
||||
CHECK(< );
|
||||
CHECK(> );
|
||||
CHECK(<=);
|
||||
CHECK(>=);
|
||||
#undef CHECK
|
||||
}
|
||||
|
||||
QTEST_APPLESS_MAIN(tst_QLatin1String)
|
||||
|
||||
|
||||
@ -4002,12 +4002,14 @@ void runIntegralTypesMysqlTest(QSqlDatabase &db, const QString &tableName, const
|
||||
QVERIFY_SQL(q, exec("DROP TABLE IF EXISTS " + tableName));
|
||||
QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + " (id " + type + ')'));
|
||||
|
||||
const int steps = 20;
|
||||
const T increment = max / steps - min / steps;
|
||||
const int steps = (max == min + 1) ? 2 : 20;
|
||||
const T increment = (max == min + 1) ? 1 : (max / steps - min / steps);
|
||||
|
||||
// insert some values
|
||||
QVector<T> values;
|
||||
QVector<QVariant> variantValues;
|
||||
values.resize(steps);
|
||||
variantValues.resize(steps);
|
||||
T v = min;
|
||||
if (withPreparedStatement) {
|
||||
QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " (id) VALUES (?)"));
|
||||
@ -4020,17 +4022,30 @@ void runIntegralTypesMysqlTest(QSqlDatabase &db, const QString &tableName, const
|
||||
QVERIFY_SQL(q, exec("INSERT INTO " + tableName + " (id) VALUES (" + QString::number(v) + QLatin1Char(')')));
|
||||
}
|
||||
values[i] = v;
|
||||
variantValues[i] = QVariant::fromValue(v);
|
||||
v += increment;
|
||||
}
|
||||
|
||||
// ensure we can read them back properly
|
||||
QVERIFY_SQL(q, exec("SELECT id FROM " + tableName));
|
||||
if (withPreparedStatement) {
|
||||
QVERIFY_SQL(q, prepare("SELECT id FROM " + tableName));
|
||||
QVERIFY_SQL(q, exec());
|
||||
} else {
|
||||
QVERIFY_SQL(q, exec("SELECT id FROM " + tableName));
|
||||
}
|
||||
QVector<T> actualValues;
|
||||
QVector<QVariant> actualVariantValues;
|
||||
actualValues.reserve(values.size());
|
||||
while (q.next()) {
|
||||
actualValues << q.value(0).value<T>();
|
||||
QVariant value = q.value(0);
|
||||
actualVariantValues << value;
|
||||
actualValues << value.value<T>();
|
||||
QVERIFY(actualVariantValues.last().userType() != qMetaTypeId<char>());
|
||||
QVERIFY(actualVariantValues.last().userType() != qMetaTypeId<signed char>());
|
||||
QVERIFY(actualVariantValues.last().userType() != qMetaTypeId<unsigned char>());
|
||||
}
|
||||
QCOMPARE(actualValues, values);
|
||||
QCOMPARE(actualVariantValues, variantValues);
|
||||
}
|
||||
|
||||
void tst_QSqlQuery::integralTypesMysql()
|
||||
@ -4041,16 +4056,18 @@ void tst_QSqlQuery::integralTypesMysql()
|
||||
|
||||
for (int i = 0; i < 2; ++i) {
|
||||
const bool withPreparedStatement = (i == 1);
|
||||
runIntegralTypesMysqlTest<char>(db, "tinyIntTest", "TINYINT", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<unsigned char>(db, "unsignedTinyIntTest", "TINYINT UNSIGNED", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<char>(db, "smallIntTest", "SMALLINT", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<unsigned char>(db, "unsignedSmallIntTest", "SMALLINT UNSIGNED", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<int>(db, "mediumIntTest", "MEDIUMINT", withPreparedStatement, -(1 << 23), (1 << 23) - 1);
|
||||
runIntegralTypesMysqlTest<unsigned int>(db, "unsignedMediumIntTest", "MEDIUMINT UNSIGNED", withPreparedStatement, 0, (1 << 24) - 1);
|
||||
runIntegralTypesMysqlTest<int>(db, "intTest", "INT", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<unsigned int>(db, "unsignedIntTest", "INT UNSIGNED", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<long long>(db, "bigIntTest", "BIGINT", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<unsigned long long>(db, "unsignedBigIntTest", "BIGINT UNSIGNED", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<bool>(db, "tinyInt1Test", "TINYINT(1)", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<bool>(db, "unsignedTinyInt1Test", "TINYINT(1) UNSIGNED", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<qint8>(db, "tinyIntTest", "TINYINT", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<quint8>(db, "unsignedTinyIntTest", "TINYINT UNSIGNED", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<qint16>(db, "smallIntTest", "SMALLINT", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<quint16>(db, "unsignedSmallIntTest", "SMALLINT UNSIGNED", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<qint32>(db, "mediumIntTest", "MEDIUMINT", withPreparedStatement, -(1 << 23), (1 << 23) - 1);
|
||||
runIntegralTypesMysqlTest<quint32>(db, "unsignedMediumIntTest", "MEDIUMINT UNSIGNED", withPreparedStatement, 0, (1 << 24) - 1);
|
||||
runIntegralTypesMysqlTest<qint32>(db, "intTest", "INT", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<quint32>(db, "unsignedIntTest", "INT UNSIGNED", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<qint64>(db, "bigIntTest", "BIGINT", withPreparedStatement);
|
||||
runIntegralTypesMysqlTest<quint64>(db, "unsignedBigIntTest", "BIGINT UNSIGNED", withPreparedStatement);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
3
tests/auto/testlib/selftests/test/BLACKLIST
Normal file
3
tests/auto/testlib/selftests/test/BLACKLIST
Normal file
@ -0,0 +1,3 @@
|
||||
#QTBUG-55155
|
||||
[runSubTest:maxwarnings all loggers]
|
||||
osx-10.11
|
||||
@ -246,6 +246,7 @@ private slots:
|
||||
void showHideEvent_data();
|
||||
void showHideEvent();
|
||||
void showHideEventWhileMinimize();
|
||||
void showHideChildrenWhileMinimize_QTBUG50589();
|
||||
|
||||
void lostUpdatesOnHide();
|
||||
|
||||
@ -3940,19 +3941,30 @@ class ShowHideEventWidget : public QWidget
|
||||
{
|
||||
public:
|
||||
int numberOfShowEvents, numberOfHideEvents;
|
||||
int numberOfSpontaneousShowEvents, numberOfSpontaneousHideEvents;
|
||||
|
||||
ShowHideEventWidget(QWidget *parent = 0)
|
||||
: QWidget(parent), numberOfShowEvents(0), numberOfHideEvents(0)
|
||||
: QWidget(parent)
|
||||
, numberOfShowEvents(0), numberOfHideEvents(0)
|
||||
, numberOfSpontaneousShowEvents(0), numberOfSpontaneousHideEvents(0)
|
||||
{ }
|
||||
|
||||
void create()
|
||||
{ QWidget::create(); }
|
||||
|
||||
void showEvent(QShowEvent *)
|
||||
{ ++numberOfShowEvents; }
|
||||
void showEvent(QShowEvent *e)
|
||||
{
|
||||
++numberOfShowEvents;
|
||||
if (e->spontaneous())
|
||||
++numberOfSpontaneousShowEvents;
|
||||
}
|
||||
|
||||
void hideEvent(QHideEvent *)
|
||||
{ ++numberOfHideEvents; }
|
||||
void hideEvent(QHideEvent *e)
|
||||
{
|
||||
++numberOfHideEvents;
|
||||
if (e->spontaneous())
|
||||
++numberOfSpontaneousHideEvents;
|
||||
}
|
||||
};
|
||||
|
||||
void tst_QWidget::showHideEvent_data()
|
||||
@ -4044,6 +4056,32 @@ void tst_QWidget::showHideEventWhileMinimize()
|
||||
QTRY_COMPARE(widget.numberOfShowEvents, showEventsBeforeMinimize + 1);
|
||||
}
|
||||
|
||||
void tst_QWidget::showHideChildrenWhileMinimize_QTBUG50589()
|
||||
{
|
||||
const QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
|
||||
if (!pi->hasCapability(QPlatformIntegration::MultipleWindows)
|
||||
|| !pi->hasCapability(QPlatformIntegration::NonFullScreenWindows)
|
||||
|| !pi->hasCapability(QPlatformIntegration::WindowManagement)) {
|
||||
QSKIP("This test requires window management capabilities");
|
||||
}
|
||||
|
||||
QWidget parent;
|
||||
ShowHideEventWidget child(&parent);
|
||||
|
||||
parent.setWindowTitle(QTest::currentTestFunction());
|
||||
parent.resize(m_testWidgetSize);
|
||||
centerOnScreen(&parent);
|
||||
parent.show();
|
||||
QVERIFY(QTest::qWaitForWindowExposed(&parent));
|
||||
|
||||
const int showEventsBeforeMinimize = child.numberOfSpontaneousShowEvents;
|
||||
const int hideEventsBeforeMinimize = child.numberOfSpontaneousHideEvents;
|
||||
parent.showMinimized();
|
||||
QTRY_COMPARE(child.numberOfSpontaneousHideEvents, hideEventsBeforeMinimize + 1);
|
||||
parent.showNormal();
|
||||
QTRY_COMPARE(child.numberOfSpontaneousShowEvents, showEventsBeforeMinimize + 1);
|
||||
}
|
||||
|
||||
void tst_QWidget::update()
|
||||
{
|
||||
#ifdef Q_OS_OSX
|
||||
@ -10135,8 +10173,11 @@ void tst_QWidget::underMouse()
|
||||
QCOMPARE(childWidget2.leaves, 0);
|
||||
|
||||
// Mouse leaves popup and enters topLevelWidget, should cause leave for popup
|
||||
// but no enter to topLevelWidget. Again, artificial leave event needed.
|
||||
// but no enter to topLevelWidget.
|
||||
#ifdef Q_OS_DARWIN
|
||||
// Artificial leave event needed for Cocoa.
|
||||
QWindowSystemInterface::handleLeaveEvent(popupWindow);
|
||||
#endif
|
||||
QTest::mouseMove(popupWindow, popupWindow->mapFromGlobal(window->mapToGlobal(inWindowPoint)));
|
||||
QApplication::processEvents();
|
||||
QVERIFY(!topLevelWidget.underMouse());
|
||||
|
||||
Loading…
Reference in New Issue
Block a user