diff options
| author | Leon Bottou <leon@bottou.org> | 2013-04-19 23:47:54 +0400 |
|---|---|---|
| committer | Leon Bottou <leon@bottou.org> | 2013-08-11 01:37:18 +0400 |
| commit | c86e8a5adf8522a7a746288382e89946bbf3be6b (patch) | |
| tree | f943319be1a3181ffdcdf444b783d723aa630770 | |
| parent | c56ea4dcccec96fcdd81c72b46e4a844ef61b6d9 (diff) | |
wintorch has both console and ide.
| -rw-r--r-- | packages/qtide/init.lua | 11 | ||||
| -rw-r--r-- | qlua/CMakeLists.txt | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/packages/qtide/init.lua b/packages/qtide/init.lua index 524503f..ae17557 100644 --- a/packages/qtide/init.lua +++ b/packages/qtide/init.lua @@ -29,13 +29,10 @@ module('qtide') local qluaide = qt.QLuaIde() -local function realmode(mode) - mode = mode or qt.qApp:readSettings("ide/mode") - if qluaide.mdiDefault then - return mode or 'mdi' - else - return mode or 'sdi' - end +local function realmode(mode) + local defaultmode = 'sdi' + -- if qluaide.mdiDefault then defaultmode = 'mdi' end + return mode or qt.qApp:readSettings("ide/mode") or defaultmode end function setup(mode) diff --git a/qlua/CMakeLists.txt b/qlua/CMakeLists.txt index b99c2c6..8ef6998 100644 --- a/qlua/CMakeLists.txt +++ b/qlua/CMakeLists.txt @@ -117,10 +117,12 @@ IF(Q_WS_X11) ENDIF(Q_WS_X11) IF(WITH_QTLUA_IDE AND WIN32) + # winqlua has only the ide ADD_EXECUTABLE(winqlua WIN32 ${qlua_SRC} qlua.rc) TARGET_LINK_LIBRARIES(winqlua ${QLUA_LIBRARIES} ${QT_QTMAIN_LIBRARY}) SET_TARGET_PROPERTIES(winqlua PROPERTIES COMPILE_FLAGS "-DWINQLUA") - ADD_EXECUTABLE(wintorch WIN32 ${qlua_SRC} qlua.rc) + # wintorch loads torch-env with both console and ide + ADD_EXECUTABLE(wintorch ${qlua_SRC} qlua.rc) TARGET_LINK_LIBRARIES(wintorch ${QLUA_LIBRARIES} ${QT_QTMAIN_LIBRARY}) SET_TARGET_PROPERTIES(wintorch PROPERTIES COMPILE_FLAGS "-DWINQLUA -DTORCH7") ENDIF(WITH_QTLUA_IDE AND WIN32) |