diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 11:30:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 11:30:51 (GMT) |
| commit | b9e86b13679f9714b1b72fbaaa94badbdd1b3ff9 (patch) | |
| tree | 7875cebf6389f0396ea8de8784bce80d4517263f | |
| parent | faaaff5257c105860f58a4ad3df531b36e27627d (diff) | |
| parent | 822efb6807d6164304bc454f39c5f739bbe1f8e5 (diff) | |
| download | Qt-b9e86b13679f9714b1b72fbaaa94badbdd1b3ff9.zip Qt-b9e86b13679f9714b1b72fbaaa94badbdd1b3ff9.tar.gz Qt-b9e86b13679f9714b1b72fbaaa94badbdd1b3ff9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a coding style issue of the GTK style
Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors
Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++
| -rw-r--r-- | examples/qtconcurrent/map/main.cpp | 2 | ||||
| -rw-r--r-- | qmake/project.cpp | 15 | ||||
| -rw-r--r-- | src/gui/styles/qgtkstyle_p.h | 5 |
3 files changed, 21 insertions, 1 deletions
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<QImage> thumbnails = QtConcurrent::blockingMapped(images, scale); + QList<QImage> thumbnails = QtConcurrent::blockingMapped<QList<QImage> >(images, scale); return 0; } 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<QString, QStringList if (place[var].isEmpty()) place[var] = QStringList(epocRoot()); } +#if defined(Q_OS_WIN32) && defined(Q_CC_MSVC) + else if(var.startsWith(QLatin1String("QMAKE_TARGET."))) { + QString ret, type = var.mid(13); + if(type == "arch") { + QString paths = qgetenv("PATH"); + QString vcBin64 = qgetenv("VCINSTALLDIR").append("\\bin\\amd64"); + QString vcBinX86_64 = qgetenv("VCINSTALLDIR").append("\\bin\\x86_amd64"); + if(paths.contains(vcBin64,Qt::CaseInsensitive) || paths.contains(vcBinX86_64,Qt::CaseInsensitive)) + ret = "x86_64"; + else + ret = "x86"; + } + place[var] = QStringList(ret); + } +#endif //qDebug("REPLACE [%s]->[%s]", qPrintable(var), qPrintable(place[var].join("::"))); return place[var]; } diff --git a/src/gui/styles/qgtkstyle_p.h b/src/gui/styles/qgtkstyle_p.h index 5bb7550..68a04e9 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 <int N> 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) |