summaryrefslogtreecommitdiffstats
path: root/qmake/option.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-02-26 15:19:54 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-02-26 15:19:54 (GMT)
commited1d9f24d035857438e5bb9ccb423310bc30310b (patch)
treeef949d57470b11331a6a2b667f2cdb5467c285cd /qmake/option.h
parentab9a87eb2a5af0b74834e247f44fb4fad0dfb8cb (diff)
parent27e403d9c6185c606980bb7881e39a2c88138a13 (diff)
downloadQt-ed1d9f24d035857438e5bb9ccb423310bc30310b.zip
Qt-ed1d9f24d035857438e5bb9ccb423310bc30310b.tar.gz
Qt-ed1d9f24d035857438e5bb9ccb423310bc30310b.tar.bz2
Merge remote branch 'origin/master' into berlin-master
Conflicts: configure.exe
Diffstat (limited to 'qmake/option.h')
-rw-r--r--qmake/option.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/option.h b/qmake/option.h
index 92689f2..9bfdaed 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -211,7 +211,8 @@ public:
TranslationsPath,
SettingsPath,
DemosPath,
- ExamplesPath
+ ExamplesPath,
+ ImportsPath
};
static QString location(LibraryLocation);
};