diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 17:42:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 17:42:33 +0100 |
| commit | 733ace5a7ad5b9e9f93ac87667d7d37fa5f894d5 (patch) | |
| tree | a88031a8e1ac30986567070728e29ed1366d0962 /qtbase.pro | |
| parent | eaff48d3622bbb0e18e79f79aac6d1ac1b7e2760 (diff) | |
| parent | 835b8213905b315645bc60ff5f2ab99340d075a2 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
configure
mkspecs/macx-ios-clang/features/default_post.prf
tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtbase.pro b/qtbase.pro index 9091fba4e0..140a137099 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -181,7 +181,7 @@ mkspecs.path = $$[QT_HOST_DATA]/mkspecs mkspecs.files = \ $$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri $$OUT_PWD/mkspecs/qdevice.pri $$OUT_PWD/mkspecs/qfeatures.pri \ $$files($$PWD/mkspecs/*) -mkspecs.files -= $$PWD/mkspecs/modules +mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs global_docs.files = $$PWD/doc/global |