diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 20:45:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 20:45:01 (GMT) |
| commit | 5749421fdaff0305d217712e3174c85a76b367c4 (patch) | |
| tree | 0b637f8b1b727b1492808cc7856c78e950558dc7 /tools/configure/configureapp.h | |
| parent | 70137e5049b14d3b5c7c018b2f2111704878dfee (diff) | |
| parent | 2838cfa7809e6b196a1ee1eb71df5894fc57dd6f (diff) | |
| download | Qt-5749421fdaff0305d217712e3174c85a76b367c4.zip Qt-5749421fdaff0305d217712e3174c85a76b367c4.tar.gz Qt-5749421fdaff0305d217712e3174c85a76b367c4.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 the remote command delimiter, this has cahnged at some point.
Assistant: Revert previous commit, issue was already fixed.
fix line endings
fix compilation with -plugin-kbd-*
Fix typo in docs
Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS
Fix compilation with QT_NO_DBUS
fix inaccurate comment
Diffstat (limited to 'tools/configure/configureapp.h')
| -rw-r--r-- | tools/configure/configureapp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index ff2ee8b..b3c07f7 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -134,6 +134,8 @@ private: QStringList qmakeLibs; QString opensslLibs; QString psqlLibs; + QString sybase; + QString sybaseLibs; QMap<QString,QString> licenseInfo; QString outputLine; |