MrBesen/QxtGlobalShortcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged in jonesmz/libqxt/Fix_featuresDir_for_qt5 (pull request #20)

Browse Source 
Update for features dir for Qt5
This commit is contained in:
Arvid Picciani 2013-07-16 15:25:17 +02:00
commit 238b5e4947
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.bat
View File

@ -191,7 +191,7 @@ goto top
echo default: search the system path
echo -featuredir (dir) ... Specifies the path to the features directory
echo qt4 default: the result of qmake -query QMAKE_MKSPECS
echo qt5 default: the result of qmake -query QMAKE_SPEC
echo qt5 default: the result of qmake -query QT_HOST_DATA + \mkspecs
echo -L (path)............ Specifies the a additional library search path
echo -I (path)............ Specifies the a additional include search path
echo -l (path)............ Add a custom library
@ -272,7 +272,7 @@ if not "%QXT_INSTALL_BINS%" == "" goto skipdefaultbins
if not "%QXT_INSTALL_FEATURES%" == "" goto skipdefaultfeatures
%QMAKE_BIN% -query QMAKE_MKSPECS > %QXT_BUILD_TREE%\mkspecs.tmp
set /p QXT_INSTALL_FEATURES=<%QXT_BUILD_TREE%\mkspecs.tmp
if "%QXT_INSTALL_FEATURES%" == "**Unknown**" %QMAKE_BIN% -query QMAKE_SPEC > %QXT_BUILD_TREE%\mkspecs.tmp & set /p QXT_INSTALL_FEATURES=<%QXT_BUILD_TREE%\mkspecs.tmp
if "%QXT_INSTALL_FEATURES%" == "**Unknown**" %QMAKE_BIN% -query QT_HOST_DATA > %QXT_BUILD_TREE%\mkspecs.tmp & set /p QXT_INSTALL_FEATURES=<%QXT_BUILD_TREE%\mkspecs.tmp & set QXT_INSTALL_FEATURES=<%QXT_INSTALL_FEATURES%\mkspecs\
if "%QXT_INSTALL_FEATURES%" == "**Unknown**" echo "Cannot find mkspecs directory. Cannot proceed." & goto end
set QXT_INSTALL_FEATURES=%QXT_INSTALL_FEATURES%\features
del %QXT_BUILD_TREE%\mkspecs.tmp