diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-15 18:12:04 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-15 18:14:13 +0100 |
| commit | 270a51b7758794d47d5ffb892c35989a87b90628 (patch) | |
| tree | c2b8b7728619a3d690978e07dd94cced48d4d9f2 /mkspecs | |
| parent | cd7ba89a07f794b17fc66ba29515b104c4d21f27 (diff) | |
| parent | 4cad9e466784ec54e3cf6f216d3df20ba7a595b0 (diff) | |
Merge remote-tracking branch 'gerrit/release' into stable
Change-Id: Ieb104d0e390218a063082c93bc9c7e412af2166d
Diffstat (limited to 'mkspecs')
| -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$@ $< |