AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.3' into 5.4

Browse Source 
Change-Id: I224e44a9df314b9a99d33148b6cf400fcbc9de8e
This commit is contained in:
Oswald Buddenhagen 2014-10-28 18:21:29 +01:00
commit 8613b64f53
11 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/features/configure.prf
View File

@ -1,4 +1,7 @@
equals(MAKEFILE_GENERATOR, UNIX) {
QMAKE_MAKE = $$(MAKE)
!isEmpty(QMAKE_MAKE) {
# We were called recursively. Use the right make, as MAKEFLAGS may be set as well.
} else:equals(MAKEFILE_GENERATOR, UNIX) {
QMAKE_MAKE = make
} else:equals(MAKEFILE_GENERATOR, MINGW) {
!equals(QMAKE_HOST.os, Windows): \

12
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
const char _CLCompile[] = "ClCompile";
const char _ItemGroup[] = "ItemGroup";
const char _Link[] = "Link";
const char _Lib[] = "Lib";
const char _ManifestTool[] = "ManifestTool";
const char _Midl[] = "Midl";
const char _ResourceCompile[] = "ResourceCompile";
@ -757,8 +758,11 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
// ClCompile
write(xml, config.compiler);
// Link
write(xml, config.linker);
// Librarian / Linker
if (config.ConfigurationType == typeStaticLibrary)
write(xml, config.librarian);
else
write(xml, config.linker);
// Midl
write(xml, config.idl);
@ -1686,7 +1690,7 @@ void VCXProjectWriter::write(XmlOutput &xml, const VCCustomBuildTool &tool)
void VCXProjectWriter::write(XmlOutput &xml, const VCLibrarianTool &tool)
{
xml
<< tag(_Link)
<< tag(_Lib)
<< attrTagX(_AdditionalDependencies, tool.AdditionalDependencies, ";")
<< attrTagX(_AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories, ";")
<< attrTagX(_AdditionalOptions, tool.AdditionalOptions, " ")
@ -1706,7 +1710,7 @@ void VCXProjectWriter::write(XmlOutput &xml, const VCLibrarianTool &tool)
//unused << attrTagS(_TargetMachine, tool.TargetMachine)
//unused << attrTagT(_TreatLibWarningAsErrors, tool.TreatLibWarningAsErrors)
//unused << attrTagT(_Verbose, tool.Verbose)
<< closetag(_Link);
<< closetag(_Lib);
}
void VCXProjectWriter::write(XmlOutput &xml, const VCResourceCompilerTool &tool)

2
src/corelib/global/qlogging.cpp
View File

@ -1379,7 +1379,7 @@ static void qt_message_print(QtMsgType msgType, const QMessageLogContext &contex
}
ungrabMessageHandler();
} else {
fprintf(stderr, "%s", message.toLocal8Bit().constData());
fprintf(stderr, "%s\n", message.toLocal8Bit().constData());
}
}

4
src/plugins/platforms/windows/qwindowsfontdatabase.h
View File

@ -38,13 +38,13 @@
#include <QtCore/QSharedPointer>
#include "qtwindows_additional.h"
QT_BEGIN_NAMESPACE
#if !defined(QT_NO_DIRECTWRITE)
struct IDWriteFactory;
struct IDWriteGdiInterop;
#endif
QT_BEGIN_NAMESPACE
class QWindowsFontEngineData
{
Q_DISABLE_COPY(QWindowsFontEngineData)

14
src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
View File

@ -41,16 +41,16 @@
#include <QtGui/private/qfontengine_p.h>
#include <QtCore/QSharedPointer>
class QWindowsFontEngineData;
struct IDWriteFont ;
struct IDWriteFontFace ;
struct IDWriteFactory ;
struct IDWriteBitmapRenderTarget ;
struct IDWriteGdiInterop ;
struct IDWriteFont;
struct IDWriteFontFace;
struct IDWriteFactory;
struct IDWriteBitmapRenderTarget;
struct IDWriteGdiInterop;
QT_BEGIN_NAMESPACE
class QWindowsFontEngineData;
class QWindowsFontEngineDirectWrite : public QFontEngine
{
public:

3
src/widgets/styles/qstyle.cpp
View File

@ -1746,8 +1746,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\value SH_ComboBox_Popup Allows popups as a combobox drop-down
menu.
\omitvalue SH_ComboBox_UseNativePopup Whether we should use a native popup.
Only supported for non-editable combo boxes on Mac OS X so far.
\omitvalue SH_ComboBox_UseNativePopup
\value SH_Workspace_FillSpaceOnMaximize The workspace should
maximize the client area.

2
src/widgets/styles/qstyle.h
View File

@ -698,6 +698,8 @@ public:
SH_ToolTip_FallAsleepDelay,
SH_Widget_Animate,
SH_Splitter_OpaqueResize,
// Whether we should use a native popup.
// Only supported for non-editable combo boxes on Mac OS X so far.
SH_ComboBox_UseNativePopup,
SH_LineEdit_PasswordMaskDelay,
SH_TabBar_ChangeCurrentDelay,

7
src/widgets/widgets/qlineedit.cpp
View File

@ -1520,13 +1520,16 @@ void QLineEdit::mouseMoveEvent(QMouseEvent * e)
#else
const bool select = (d->imHints & Qt::ImhNoPredictiveText);
#endif
#ifndef QT_NO_IM
if (d->control->composeMode() && select) {
int startPos = d->xToPos(d->mousePressPos.x());
int currentPos = d->xToPos(e->pos().x());
if (startPos != currentPos)
d->control->setSelection(startPos, currentPos - startPos);
} else {
} else
#endif
{
d->control->moveCursor(d->xToPos(e->pos().x()), select);
}
}
@ -1577,6 +1580,7 @@ void QLineEdit::mouseDoubleClickEvent(QMouseEvent* e)
int position = d->xToPos(e->pos().x());
// exit composition mode
#ifndef QT_NO_IM
if (d->control->composeMode()) {
int preeditPos = d->control->cursor();
int posInPreedit = position - d->control->cursor();
@ -1601,6 +1605,7 @@ void QLineEdit::mouseDoubleClickEvent(QMouseEvent* e)
position += (sizeChange - preeditLength);
}
}
#endif
if (position >= 0)
d->control->selectWordAtPos(position);

2
src/widgets/widgets/qlineedit_p.cpp
View File

@ -47,8 +47,8 @@
#ifndef QT_NO_IM
#include "qinputmethod.h"
#include "qlist.h"
#include <qpropertyanimation.h>
#endif
#include <qpropertyanimation.h>
QT_BEGIN_NAMESPACE

2
src/widgets/widgets/qwidgetlinecontrol.cpp
View File

@ -179,6 +179,7 @@ void QWidgetLineControl::paste(QClipboard::Mode clipboardMode)
*/
void QWidgetLineControl::commitPreedit()
{
#ifndef QT_NO_IM
if (!composeMode())
return;
@ -190,6 +191,7 @@ void QWidgetLineControl::commitPreedit()
setPreeditArea(-1, QString());
m_textLayout.clearAdditionalFormats();
updateDisplayText(/*force*/ true);
#endif
}

2
src/widgets/widgets/qwidgetlinecontrol_p.h
View File

@ -228,8 +228,10 @@ public:
}
void setText(const QString &txt)
{
#ifndef QT_NO_IM
if (composeMode())
qApp->inputMethod()->reset();
#endif
internalSetText(txt, -1, false);
}
void commitPreedit();