diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:15:53 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:43:26 +0100 |
commit | e5ac4afbf954a3e1616ce8543d46ddc668d0374f (patch) | |
tree | be6d97001edebd5cb74c64aaf0010f3cc76a7293 /qmake/option.h | |
parent | e3ed95dd44b95b6e9361b562807e711d7ce5a58b (diff) | |
parent | 03c1a6ac717e3c5693653a5e294214056bda970e (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/uikit/default_post.prf
Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218
Diffstat (limited to 'qmake/option.h')
-rw-r--r-- | qmake/option.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/option.h b/qmake/option.h index 8b9e2f1027..eaa3706b24 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -#define QMAKE_VERSION_STR "3.0" +#define QMAKE_VERSION_STR "3.1" QString qmake_getpwd(); bool qmake_setpwd(const QString &p); |