diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 08:54:29 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 08:54:29 +1000 |
| commit | 04dd09b17fadf5e1917a286870469c0733044cf6 (patch) | |
| tree | 9a32e6446c160362933ccc3e8495b6ce805f63f5 | |
| parent | 0bd5d8134fd6bc045efcdf9ec3a00d73c5abe3f2 (diff) | |
| parent | 5360908e1438d399398ffc71e5bf7e4e92421f32 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
Clean up inconsistent usage of `depends' in qt.pro
The qtlocation module depends on declarative too
| -rw-r--r-- | qt.pro | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -59,15 +59,15 @@ module_qtactiveqt.depends = module_qtbase module_qlalr.subdir = $$IN_PWD/qlalr module_qlalr.target = module-qlalr -module_qlalr.depends = module-qtbase +module_qlalr.depends = module_qtbase module_qtqa.subdir = $$IN_PWD/qtqa module_qtqa.target = module-qtqa -module_qtqa.depends = module-qtbase +module_qtqa.depends = module_qtbase module_qtlocation.subdir = $$IN_PWD/qtlocation module_qtlocation.target = module-qtlocation -module_qtlocation.depends = module-qtbase +module_qtlocation.depends = module_qtbase module_qtdeclarative # not yet enabled by default module_qtlocation.CONFIG = no_default_target no_default_install |