diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-15 18:23:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-15 19:47:44 +0100 |
| commit | 122ee7a367bc379c7b93b82118d2ac8f10068986 (patch) | |
| tree | 097b576eb975e6da13de024191070260c5e9817b /mkspecs/win32-msvc2012/qmake.conf | |
| parent | c1b974c611f963c8f46bdea0aada1b7f6565fc56 (diff) | |
| parent | 270a51b7758794d47d5ffb892c35989a87b90628 (diff) | |
Merge "Merge remote-tracking branch 'gerrit/release' into stable" into refs/staging/stable
Diffstat (limited to 'mkspecs/win32-msvc2012/qmake.conf')
| -rw-r--r-- | mkspecs/win32-msvc2012/qmake.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mkspecs/win32-msvc2012/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf index 53170c8436..8a595d16b1 100644 --- a/mkspecs/win32-msvc2012/qmake.conf +++ b/mkspecs/win32-msvc2012/qmake.conf @@ -51,8 +51,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc QMAKE_CXXFLAGS_EXCEPTIONS_OFF = QMAKE_INCDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |