summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-09 03:40:10 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-09 03:40:10 (GMT)
commitb42a7c06f0a079fff9c0da90dd4dc71fe50397f9 (patch)
treee04c31b28efa7925bd5f795b883acc432e78c715
parente6e173b457d41ea232c30c6582493cb54ee8f7c9 (diff)
parent6e2bc8975dc940832e9a0765181b117c2e319855 (diff)
downloadQt-b42a7c06f0a079fff9c0da90dd4dc71fe50397f9.zip
Qt-b42a7c06f0a079fff9c0da90dd4dc71fe50397f9.tar.gz
Qt-b42a7c06f0a079fff9c0da90dd4dc71fe50397f9.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compilation for solaris based compilers, macro doesn't require trailing semicolon.
-rw-r--r--tools/linguist/lupdate/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 6e3ab5c..a575192 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -63,7 +63,7 @@ static void printOut(const QString & out)
}
class LU {
- Q_DECLARE_TR_FUNCTIONS(LUpdate);
+ Q_DECLARE_TR_FUNCTIONS(LUpdate)
};
static void recursiveFileInfoList(const QDir &dir,