Build on Windows.
--HG-- branch : develop
This commit is contained in:
parent
64c27f0e34
commit
ce5882198e
|
@ -38,6 +38,7 @@
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
|
#include <QTemporaryFile>
|
||||||
#include <QUndoStack>
|
#include <QUndoStack>
|
||||||
#include <QtCore/qmath.h>
|
#include <QtCore/qmath.h>
|
||||||
|
|
||||||
|
|
|
@ -33,8 +33,12 @@
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
|
||||||
#ifdef Q_OS_WIN32
|
#ifdef Q_OS_WIN32
|
||||||
#define NOMINMAX
|
# if defined( Q_CC_MSVC ) // MSVC USED
|
||||||
# include <Windows.h>
|
# ifndef NOMINMAX
|
||||||
|
# define NOMINMAX // DISABLE min/max MACROS
|
||||||
|
# endif
|
||||||
|
# endif /*Q_CC_MSVC*/
|
||||||
|
# include <windows.h>
|
||||||
|
|
||||||
extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
|
extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
|
||||||
#endif /*Q_OS_WIN32*/
|
#endif /*Q_OS_WIN32*/
|
||||||
|
|
|
@ -29,18 +29,6 @@ BEGIN
|
||||||
|
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
BEGIN
|
BEGIN
|
||||||
/* The following line should only be modified for localized versions. */
|
VALUE "Translation", 0x0409, 0x04E4 //U.S. English
|
||||||
/* It consists of any number of WORD,WORD pairs, with each pair */
|
|
||||||
/* describing a language,codepage combination supported by the file. */
|
|
||||||
/* */
|
|
||||||
/* For example, a file might have values "0x409,1252" indicating that it */
|
|
||||||
/* supports English language (0x409) in the Windows ANSI codepage (1252). */
|
|
||||||
VALUE "Translation", 0x0409, 1252, //U.S. English
|
|
||||||
VALUE "Translation", 0x0405, 1200, //Czech
|
|
||||||
VALUE "Translation", 0x0407, 1200, //German
|
|
||||||
VALUE "Translation", 0x040C, 1200, //French
|
|
||||||
VALUE "Translation", 0x040D, 1200, //Hebrew
|
|
||||||
VALUE "Translation", 0x0413, 1200, //Dutch
|
|
||||||
VALUE "Translation", 0x0419, 1200 //Russian
|
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
|
|
Loading…
Reference in New Issue
Block a user