diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 23:52:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 23:52:06 (GMT) |
| commit | c70e3f24a97b82f5ce9ad890fa95369e425a31ac (patch) | |
| tree | 432987220d2f7fa2b96a5307d0d8608e7eb184be /tools | |
| parent | 07f131927faa09402589da7b4bfb516482f59e46 (diff) | |
| parent | c05f38f37fbe2192d135881de3dba087ac71ffe1 (diff) | |
| download | Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.zip Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.tar.gz Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.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:
Revert "Compile fix for MSVC"
Compile fix for MSVC
Improve QAccessible for QAccessibleTabBar
Improve QAccessible for QTabBar
fix the export macros for the QtDBus module
rebuild configure.exe
make "configure -qt-gif" work again on Windows
Fix a typo in harfbuzz thai line breaking.
Ensure that font sizes that are > 0 and < 1 are still respected
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 | ||||
| -rw-r--r-- | tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c3498e3..f7dac93 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -581,8 +581,8 @@ void Configure::parseCmdLine() // Image formats -------------------------------------------- else if (configCmdLine.at(i) == "-no-gif") dictionary[ "GIF" ] = "no"; - else if (configCmdLine.at(i) == "-qt-gif") - dictionary[ "GIF" ] = "yes"; + else if (configCmdLine.at(i) == "-qt-gif") + dictionary[ "GIF" ] = "plugin"; else if (configCmdLine.at(i) == "-no-libtiff") { dictionary[ "TIFF"] = "no"; diff --git a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp index 3a80019..ba2bdd8 100644 --- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -64,7 +64,7 @@ static const char docTypeHeader[] = // in qdbusxmlgenerator.cpp QT_BEGIN_NAMESPACE -extern QDBUS_EXPORT QString qDBusGenerateMetaObjectXml(QString interface, const QMetaObject *mo, +extern Q_DBUS_EXPORT QString qDBusGenerateMetaObjectXml(QString interface, const QMetaObject *mo, const QMetaObject *base, int flags); QT_END_NAMESPACE |