diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-25 14:53:09 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-25 14:53:09 (GMT) |
| commit | 8d720825279c8bf06d28b1f756031402f117002b (patch) | |
| tree | 5ea180f93387223c532d76f53d74054ea7a6f2b4 /qmake/option.h | |
| parent | 8928e37c8b1b375e74c5981915c034123de11b3d (diff) | |
| parent | d6197028818e51e78249b029a823fde1b0ffde03 (diff) | |
| download | Qt-8d720825279c8bf06d28b1f756031402f117002b.zip Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.gz Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.bz2 | |
Merge branch 'master' of git:qt/qt-qml
Conflicts:
src/declarative/graphicsitems/qdeclarativeparticles.cpp
Diffstat (limited to 'qmake/option.h')
| -rw-r--r-- | qmake/option.h | 3 |
1 files changed, 2 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); }; |