diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qdnd.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 7 | ||||
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbdrag.cpp | 3 | ||||
| -rw-r--r-- | src/tools/qdoc/main.cpp | 1 | ||||
| -rw-r--r-- | src/tools/rcc/main.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 2 |
8 files changed, 21 insertions, 7 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 7c0a2c277b..f2ebeb6a03 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -305,7 +305,7 @@ QLibraryInfo::buildDate() # elif _MSC_VER < 1900 # define COMPILER_STRING "MSVC 2013" # else -# define COMPILER_STRING "MSVC <unknown version>" +# define COMPILER_STRING "MSVC _MSC_VER " QT_STRINGIFY(_MSC_VER) # endif #else # define COMPILER_STRING "<unknown compiler>" diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index d34a135eb7..328ca389ed 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -142,6 +142,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) QGuiApplicationPrivate::instance()->notifyDragStarted(o); const Qt::DropAction result = m_platformDrag->drag(m_object); m_object = 0; + o->deleteLater(); return result; } diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index c155512e9d..6ac84c6cab 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1109,6 +1109,8 @@ void QGuiApplicationPrivate::createPlatformIntegration() // Get command line params + QString icon; + int j = argc ? 1 : 0; for (int i=1; i<argc; i++) { if (argv[i] && *argv[i] != '-') { @@ -1136,8 +1138,7 @@ void QGuiApplicationPrivate::createPlatformIntegration() firstWindowTitle = QString::fromLocal8Bit(argv[i]); } else if (arg == "-qwindowicon" || (isXcb && arg == "-icon")) { if (++i < argc) { - const QString icon = QString::fromLocal8Bit(argv[i]); - forcedWindowIcon = QDir::isAbsolutePath(icon) ? QIcon(icon) : QIcon::fromTheme(icon); + icon = QString::fromLocal8Bit(argv[i]); } } else { argv[j++] = argv[i]; @@ -1151,6 +1152,8 @@ void QGuiApplicationPrivate::createPlatformIntegration() init_platform(QLatin1String(platformName), platformPluginPath, platformThemeName, argc, argv); + if (!icon.isEmpty()) + forcedWindowIcon = QDir::isAbsolutePath(icon) ? QIcon(icon) : QIcon::fromTheme(icon); } /*! diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index a85480c56b..3ac8b8f56f 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -277,6 +277,10 @@ void QNetworkReplyHttpImpl::abort() // call finished which will emit signals // FIXME shouldn't this be emitted Queued? d->error(OperationCanceledError, tr("Operation canceled")); + + // If state is WaitingForSession, calling finished has no effect + if (d->state == QNetworkReplyHttpImplPrivate::WaitingForSession) + d->state = QNetworkReplyHttpImplPrivate::Working; d->finished(); } diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index bcadcd1f02..bd28548cba 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -1010,9 +1010,6 @@ void QXcbDrag::handleFinished(const xcb_client_message_event_t *event) // current_target = 0; // current_proxy_target = 0; - if (t.drag) - t.drag->deleteLater(); - // current_target = target; // current_proxy_target = proxy_target; // current_embedding_widget = embedding_widget; diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index aba9956604..e42262f8d5 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -462,6 +462,7 @@ static void processQdocconfFile(const QString &fileName) CodeParser *codeParser = CodeParser::parserForHeaderFile(h.key()); if (codeParser) { ++parsed; + Generator::debug(QString("Parsing " + h.key())); codeParser->parseHeaderFile(config.location(), h.key()); usedParsers.insert(codeParser); } diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index 99833101d2..5ded9a9b78 100644 --- a/src/tools/rcc/main.cpp +++ b/src/tools/rcc/main.cpp @@ -283,7 +283,13 @@ int runRcc(int argc, char *argv[]) return 1; } } - return library.output(out, temp, errorDevice) ? 0 : 1; + bool success = library.output(out, temp, errorDevice); + if (!success) { + // erase the output file if we failed + out.remove(); + return 1; + } + return 0; } Q_CORE_EXPORT extern QBasicAtomicInt qt_qhash_seed; // from qhash.cpp diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index 5612aa2e75..89bda70f31 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -626,6 +626,8 @@ QString QAccessibleLineEdit::text(QAccessible::Text t) const case QAccessible::Value: if (lineEdit()->echoMode() == QLineEdit::Normal) str = lineEdit()->text(); + else if (lineEdit()->echoMode() != QLineEdit::NoEcho) + str = QString(lineEdit()->text().length(), QChar::fromLatin1('*')); break; default: break; |