Skip to content

Commit

Permalink
Qt 5.2 is not required for Windows, strictly speaking only 5.1 is req…
Browse files Browse the repository at this point in the history 
…uired by the code, QT_MIN_VERSION should reflect this. Use online installer Qt path on Windows.
  • Loading branch information
@lasconic
lasconic committed Feb 8, 2014
1 parent 9bf3b5b commit 1d54c0a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
7 changes: 2 additions & 5 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,8 @@ endif (MINGW OR APPLE)
##
## look for Qt5
##
if(MINGW)
SET(QT_MIN_VERSION "5.2.0")
else(MINGW)
SET(QT_MIN_VERSION "5.1.0")
endif(MINGW)
SET(QT_MIN_VERSION "5.1.0")

This comment has been minimized.

Sign in to view

Copy link
@Jojo-Schmitz

Jojo-Schmitz Feb 8, 2014

Contributor

I seem to remember that there was a problem with Qt 5.1.0 and Windows (something with printing?), so there we'd want at least 5.1.1, don't we?

This comment has been minimized.

Sign in to view

Copy link
@lasconic

lasconic Feb 8, 2014

Author Contributor

We (as MuseScore project) want Qt 5.2.1 but still, if for any reason someone wants to build with Qt 5.1 on Windows , it is possible...

This comment has been minimized.

Sign in to view

Copy link
@Jojo-Schmitz

Jojo-Schmitz Feb 8, 2014

Contributor

OK, understood. And welcome back, you've been missed desperately ;-)

This comment has been minimized.

Sign in to view

Copy link
@lasconic

lasconic Feb 8, 2014

Author Contributor

Thank you ;)
I read the forum post now that motivates your change. We will see how it goes. In theory, it just feel right for me to reserve QT_MIN_VERSION for the source code required version but maybe practice will tell otherwise...

This comment has been minimized.

Sign in to view

Copy link
@Jojo-Schmitz

Jojo-Schmitz Feb 8, 2014

Contributor

If there is a way to find out during build which version gets used, some of my changes (reg. which libs to use) can get adjusted to allow for either version?

This comment has been minimized.

Sign in to view

Copy link
@lasconic

lasconic Feb 8, 2014

Author Contributor

Yes, there is probably a way to get Qt version at runtime but it's not worth the effort. Average compilers should read the handbook (thanks for the edit btw) and advanced ones who wants to use another Qt version should cope with the problem themselves. In the meantime, nightly builds are back!

SET(QT_USE_QTXML TRUE)
SET(QT_USE_QTSVG TRUE)
SET(QT_USE_QTNETWORK TRUE)
Expand Down
4 changes: 2 additions & 2 deletions build/mingw32.mingw.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

set (CMAKE_SYSTEM_NAME "Windows")

set (CROSS C:/Qt/Qt5.2.1/Tools/mingw48_32)
set (CROSSQT C:/Qt/Qt5.2.1/5.2.1/mingw48_32)
set (CROSS C:/Qt/Tools/mingw48_32)
set (CROSSQT C:/Qt/5.2.1/mingw48_32)

set (CMAKE_C_COMPILER ${CROSS}/bin/gcc.exe)
set (CMAKE_CXX_COMPILER ${CROSS}/bin/g++.exe)
Expand Down

0 comments on commit 1d54c0a

Please sign in to comment.