diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-08-17 11:37:45 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-08-17 11:37:45 (GMT) |
| commit | 9b4982af65e533b0613abd0f889bcf6e7673e410 (patch) | |
| tree | 6da061304e5d58fc6306600a06e8de07db246788 /mkspecs/features | |
| parent | efd84105355552bcb203b5e402be0352641e7480 (diff) | |
| parent | dc2771eb57702a0daf5164b0f9ad569c9fe0e5ba (diff) | |
| download | Qt-9b4982af65e533b0613abd0f889bcf6e7673e410.zip Qt-9b4982af65e533b0613abd0f889bcf6e7673e410.tar.gz Qt-9b4982af65e533b0613abd0f889bcf6e7673e410.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/unix/dylib.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/unix/opengl.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/unix/x11lib.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/unix/x11sm.prf | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/unix/dylib.prf b/mkspecs/features/unix/dylib.prf index 1268fae..8b13789 100644 --- a/mkspecs/features/unix/dylib.prf +++ b/mkspecs/features/unix/dylib.prf @@ -1 +1 @@ -LIBS += $$QMAKE_LIBS_DYNLOAD + diff --git a/mkspecs/features/unix/opengl.prf b/mkspecs/features/unix/opengl.prf index 231d0aa..2fdf324 100644 --- a/mkspecs/features/unix/opengl.prf +++ b/mkspecs/features/unix/opengl.prf @@ -1,4 +1,4 @@ INCLUDEPATH += $$QMAKE_INCDIR_OPENGL !isEmpty(QMAKE_LIBDIR_OPENGL):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL -target_qt:LIBS += $$QMAKE_LIBS_OPENGL_QT +target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_QT else:LIBS += $$QMAKE_LIBS_OPENGL diff --git a/mkspecs/features/unix/x11lib.prf b/mkspecs/features/unix/x11lib.prf index 521518a..b661d53 100644 --- a/mkspecs/features/unix/x11lib.prf +++ b/mkspecs/features/unix/x11lib.prf @@ -1,2 +1,2 @@ !isEmpty(QMAKE_LIBDIR_X11):QMAKE_LIBDIR += $$QMAKE_LIBDIR_X11 -LIBS += $$QMAKE_LIBS_X11 +LIBS_PRIVATE += $$QMAKE_LIBS_X11 diff --git a/mkspecs/features/unix/x11sm.prf b/mkspecs/features/unix/x11sm.prf index b455b01..5176147 100644 --- a/mkspecs/features/unix/x11sm.prf +++ b/mkspecs/features/unix/x11sm.prf @@ -1,2 +1,2 @@ !isEmpty(QMAKE_LIBDIR_X11):QMAKE_LIBDIR += $$QMAKE_LIBDIR_X11 -LIBS += $$QMAKE_LIBS_X11SM +LIBS_PRIVATE += $$QMAKE_LIBS_X11SM |