diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 12:18:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 12:18:02 (GMT) |
| commit | 27e403d9c6185c606980bb7881e39a2c88138a13 (patch) | |
| tree | 5abe2f83832f9c2a7b3ef1804f4a79d89fa8b831 /qmake | |
| parent | ae13ad51dda7246e73d282165201f637d04a667e (diff) | |
| parent | 67bb989e11cf47431e419966bff7257c028ea958 (diff) | |
| download | Qt-27e403d9c6185c606980bb7881e39a2c88138a13.zip Qt-27e403d9c6185c606980bb7881e39a2c88138a13.tar.gz Qt-27e403d9c6185c606980bb7881e39a2c88138a13.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (139 commits)
Fixed qdeclarativeconnection test.
missed rename
Revert "Some animation cleanup/refactoring."
Rename files to follow class name.
Change Connection syntax as per QT-2822.
Doc
update painted geometry on pixmapChanged rather than sourceChanged
Make Flickable overshoot behavior nicer.
Polish QDeclarativeProperty API
Test, demo, and work-around bug QTBUG-8535
Fix ParentAnimation crash.
Tiny doc tweak.
Work around requires() bug in qmake
Make sure that QEasingCurve::type when streamed is a quint8, as documented
Add QEasingCurve to datastream format docs
Move QEasingCurve datastream autotest to qdatastream for more comprehensive tests
Some animation cleanup/refactoring.
Fix Flickable.overShoot doc - it is a bool not a real
Rebuild since -declarative auto detection changed.
Renamed Flickable viewportXXX properties contentXXX
...
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/option.h | 3 | ||||
| -rw-r--r-- | qmake/property.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/qmake/option.h b/qmake/option.h index 514e442..a2ca676 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -205,7 +205,8 @@ public: TranslationsPath, SettingsPath, DemosPath, - ExamplesPath + ExamplesPath, + ImportsPath }; static QString location(LibraryLocation); }; diff --git a/qmake/property.cpp b/qmake/property.cpp index cab034f..fde7c65 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -95,6 +95,8 @@ QMakeProperty::value(QString v, bool just_check) return QLibraryInfo::location(QLibraryInfo::BinariesPath); else if(v == "QT_INSTALL_PLUGINS") return QLibraryInfo::location(QLibraryInfo::PluginsPath); + else if(v == "QT_INSTALL_IMPORTS") + return QLibraryInfo::location(QLibraryInfo::ImportsPath); else if(v == "QT_INSTALL_TRANSLATIONS") return QLibraryInfo::location(QLibraryInfo::TranslationsPath); else if(v == "QT_INSTALL_CONFIGURATION") @@ -191,6 +193,7 @@ QMakeProperty::exec() specialProps.append("QT_INSTALL_LIBS"); specialProps.append("QT_INSTALL_BINS"); specialProps.append("QT_INSTALL_PLUGINS"); + specialProps.append("QT_INSTALL_IMPORTS"); specialProps.append("QT_INSTALL_TRANSLATIONS"); specialProps.append("QT_INSTALL_CONFIGURATION"); specialProps.append("QT_INSTALL_EXAMPLES"); |