summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-06 12:25:10 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-06 12:25:10 (GMT)
commit9923c171853b2f8b4a3a6b096d263fa6cf461a0b (patch)
tree38ea3966fcd11725c7d3c1606be637a000c233fd /qmake
parentbc83b5856416e5927822ee3e758d231fc9f43c38 (diff)
parent8dbc32699dec7aa928eb9518c05437f481d11a43 (diff)
downloadQt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.zip
Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.tar.gz
Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.tar.bz2
merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts: tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
Diffstat (limited to 'qmake')
-rw-r--r--qmake/option.cpp3
-rw-r--r--qmake/qmake.pri2
2 files changed, 4 insertions, 1 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 2308017..5d7cb9b 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -150,6 +150,9 @@ bool usage(const char *a0)
" In this mode qmake interprets files as files to\n"
" be built,\n"
" defaults to %s\n"
+ " Note: The created .pro file probably will \n"
+ " need to be edited. For example add the QT variable to \n"
+ " specify what modules are required.\n"
" -makefile Put qmake into makefile generation mode%s\n"
" In this mode qmake interprets files as project files to\n"
" be processed, if skipped qmake will try to find a project\n"
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 9ba8506..1f9243b 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -107,7 +107,7 @@ bootstrap { #Qt code
SOURCES += qfsfileengine_unix.cpp qfsfileengine_iterator_unix.cpp
mac {
SOURCES += qcore_mac.cpp qsettings_mac.cpp
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported)
+ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
LIBS += -framework ApplicationServices
}
} else:win32 {