summaryrefslogtreecommitdiffstats
path: root/src/qbase.pri
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2010-12-01 08:21:03 (GMT)
committeraavit <qt-info@nokia.com>2010-12-01 08:21:03 (GMT)
commit0bc9a8abf52c1d4c98aefdb502487bcb8eb131bc (patch)
tree2cb7ed8e38523641a8a88a0d4c1f42014cae10af /src/qbase.pri
parentde30288bb108d70cd66774c3beb7497efb5d0e6d (diff)
parentd6174e48b4835d6fdaf10d9b742b866f03cbdcef (diff)
downloadQt-0bc9a8abf52c1d4c98aefdb502487bcb8eb131bc.zip
Qt-0bc9a8abf52c1d4c98aefdb502487bcb8eb131bc.tar.gz
Qt-0bc9a8abf52c1d4c98aefdb502487bcb8eb131bc.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/qbase.pri')
-rw-r--r--src/qbase.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qbase.pri b/src/qbase.pri
index 4217618..3a40928 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -4,7 +4,7 @@ INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat
isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
TEMPLATE = lib
isEmpty(QT_MAJOR_VERSION) {
- VERSION=4.7.1
+ VERSION=4.7.2
} else {
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
}
@@ -36,7 +36,7 @@ CONFIG += qt warn_on depend_includepath
CONFIG += qmake_cache target_qt
CONFIG -= fix_output_dirs
win32|mac:!macx-xcode:CONFIG += debug_and_release
-linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
+linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions