From 1a4ee517638e1ba3cdc622af70b3d53561d23392 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Thu, 25 Mar 2010 17:39:41 +0100 Subject: Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++ The variable QMAKE_TARGET.arch shall be used to determine cross compiling for x64 on a x32 system. Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-9160 --- qmake/project.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/qmake/project.cpp b/qmake/project.cpp index 01a3843..56707cf 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -3148,6 +3148,21 @@ QStringList &QMakeProject::values(const QString &_var, QMap[%s]", qPrintable(var), qPrintable(place[var].join("::"))); return place[var]; } -- cgit v0.12 From a354e98838e67e9bbd9473d4cd42b89f45d0e3fe Mon Sep 17 00:00:00 2001 From: Johan Hauan Date: Tue, 6 Apr 2010 11:34:57 +0200 Subject: Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors GTK Style A QHashableLatin1Literal was a bit too clever for sunstudio. Added and alternate constructor for sunstudio(ifdef) Should not affect other compilers. Other: Minor compile fixes, extra semicolon after macros etc. Merge-request: 547 Reviewed-by: Benjamin Poulain --- examples/qtconcurrent/map/main.cpp | 2 +- src/gui/styles/qgtkstyle_p.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp index 6068d30..6afefca 100644 --- a/examples/qtconcurrent/map/main.cpp +++ b/examples/qtconcurrent/map/main.cpp @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) // Use QtConcurrentBlocking::mapped to apply the scale function to all the // images in the list. - QList thumbnails = QtConcurrent::blockingMapped(images, scale); + QList thumbnails = QtConcurrent::blockingMapped >(images, scale); return 0; } diff --git a/src/gui/styles/qgtkstyle_p.h b/src/gui/styles/qgtkstyle_p.h index 5bb7550..f0aee46 100644 --- a/src/gui/styles/qgtkstyle_p.h +++ b/src/gui/styles/qgtkstyle_p.h @@ -85,9 +85,14 @@ public: int size() const { return m_size; } const char *data() const { return m_data; } +#ifdef __SUNPRO_CC + QHashableLatin1Literal(const char* str) + : m_size(strlen(str)), m_data(str) {} +#else template QHashableLatin1Literal(const char (&str)[N]) : m_size(N - 1), m_data(str) {} +#endif QHashableLatin1Literal(const QHashableLatin1Literal &other) : m_size(other.m_size), m_data(other.m_data) -- cgit v0.12 From 822efb6807d6164304bc454f39c5f739bbe1f8e5 Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Tue, 6 Apr 2010 11:46:19 +0200 Subject: Fix a coding style issue of the GTK style A tab was introduced in 16614121f8eff813efadc999a7db9ce47eae769e --- src/gui/styles/qgtkstyle_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/styles/qgtkstyle_p.h b/src/gui/styles/qgtkstyle_p.h index f0aee46..68a04e9 100644 --- a/src/gui/styles/qgtkstyle_p.h +++ b/src/gui/styles/qgtkstyle_p.h @@ -87,7 +87,7 @@ public: #ifdef __SUNPRO_CC QHashableLatin1Literal(const char* str) - : m_size(strlen(str)), m_data(str) {} + : m_size(strlen(str)), m_data(str) {} #else template QHashableLatin1Literal(const char (&str)[N]) -- cgit v0.12 From 0c442405a9f85f402d508af2be0a668f34f35caf Mon Sep 17 00:00:00 2001 From: Carlos Manuel Duclos Vergara Date: Tue, 6 Apr 2010 13:47:24 +0200 Subject: [Cocoa] QDialogs with WindowStayOnStopHint parent The problem is with beginModalSession which reorders the windows and sends our window back. This patch queries the window level before calling beginModalSession and sets it after beginModalSession. Task-number: QTBUG-9392 Reviewed-by: Richard Moe Gustavsen --- src/gui/kernel/qeventdispatcher_mac.mm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm index 62e1e81..a7f1224 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/kernel/qeventdispatcher_mac.mm @@ -831,7 +831,14 @@ NSModalSession QEventDispatcherMacPrivate::currentModalSession() QBoolBlocker block1(blockSendPostedEvents, true); info.nswindow = window; [(NSWindow*) info.nswindow retain]; - info.session = [NSApp beginModalSessionForWindow:window]; + // When creating a modal session cocoa will rearrange the windows. + // In order to avoid windows to be put behind another we need to + // keep the window level. + { + int level = [window level]; + info.session = [NSApp beginModalSessionForWindow:window]; + [window setLevel:level]; + } } currentModalSessionCached = info.session; } -- cgit v0.12 From 30f4ad046123449e53b8d4cf936300753df126ec Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 6 Apr 2010 18:09:15 +0200 Subject: Doc: Remove QDBusServer from the public documentation. Task-number: QTBUG-5066 --- src/dbus/qdbusserver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index 8f9323a..13b18a6 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \class QDBusServer \inmodule QtDBus - \since 4.2 + \internal \brief The QDBusServer class provides peer-to-peer communication between processes on the same computer. -- cgit v0.12 From d65d3becc292523f0962aac9d2bf7b96d9c47c04 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 6 Apr 2010 18:15:00 +0200 Subject: Doc: update the QDBusPendingCallWatcher example to show where to delete Task-number: QTBUG-8865 --- doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp b/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp index 94a9f68..2867bd5a 100644 --- a/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp +++ b/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp @@ -61,5 +61,6 @@ void MyClass::callFinishedSlot(QDBusPendingCallWatcher *call) QByteArray data = reply.argumentAt<1>(); showReply(text, data); } + call->deleteLater(); } //! [1] -- cgit v0.12