fix qmake build and version
This commit is contained in:
parent
322c448bc1
commit
26b9996ec6
|
@ -265,6 +265,10 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
|
|||
|
||||
#include "framelesshelper.version"
|
||||
|
||||
#ifndef __FRAMELESSHELPER__
|
||||
# define __FRAMELESSHELPER__ __FRAMELESSHELPER_VERSION__
|
||||
#endif // __FRAMELESSHELPER__
|
||||
|
||||
namespace Global
|
||||
{
|
||||
|
||||
|
|
|
@ -7,9 +7,6 @@ CORE_PRIV_INC_DIR = $$CORE_PUB_INC_DIR/private
|
|||
CORE_EXTRA_INC_DIR = $$PWD/inc/core
|
||||
CORE_SRC_DIR = $$PWD/../src/core
|
||||
|
||||
DEFINES += \
|
||||
FRAMELESSHELPER_CORE_STATIC
|
||||
|
||||
INCLUDEPATH += \
|
||||
$$BASE_INC_DIR \
|
||||
$$COMMON_INC_DIR \
|
||||
|
|
|
@ -22,16 +22,14 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
// Generated automatically by CMake.
|
||||
// WARNING! DO NOT EDIT THIS FILE MANUALLY!
|
||||
// ALL CHANGES WILL BE LOST AFTER RE-CONFIGURING!
|
||||
// Also please do not include this file directly,
|
||||
// it's designed to be included by FramelessHelper's own headers.
|
||||
// Caution: This file is generated by CMake automatically during configure.
|
||||
// WARNING!!! DO NOT EDIT THIS FILE MANUALLY!!!
|
||||
// ALL YOUR MODIFICATIONS HERE WILL GET LOST AFTER RE-CONFIGURING!!!
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifndef _FRAMELESSHELPER_CONFIG_DEFINED_
|
||||
#define _FRAMELESSHELPER_CONFIG_DEFINED_
|
||||
#ifndef _FRAMELESSHELPER_CONFIG_INCLUDE_GUARD_
|
||||
#define _FRAMELESSHELPER_CONFIG_INCLUDE_GUARD_
|
||||
|
||||
#define FRAMELESSHELPER_FEATURE_static_build 1
|
||||
#define FRAMELESSHELPER_FEATURE_widgets 1
|
||||
|
@ -46,4 +44,4 @@
|
|||
#define FRAMELESSHELPER_FEATURE_border_painter 1
|
||||
#define FRAMELESSHELPER_FEATURE_system_button 1
|
||||
|
||||
#endif // _FRAMELESSHELPER_CONFIG_DEFINED_
|
||||
#endif // _FRAMELESSHELPER_CONFIG_INCLUDE_GUARD_
|
||||
|
|
|
@ -22,30 +22,38 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
// Generated automatically by QMake.
|
||||
// WARNING! DO NOT EDIT THIS FILE MANUALLY!
|
||||
// ALL CHANGES WILL BE LOST AFTER RE-CONFIGURING!
|
||||
// Also please do not include this file directly,
|
||||
// it's designed to be included by FramelessHelper's own headers.
|
||||
// Caution: This file is generated by CMake automatically during configure.
|
||||
// WARNING!!! DO NOT EDIT THIS FILE MANUALLY!!!
|
||||
// ALL YOUR MODIFICATIONS HERE WILL GET LOST AFTER RE-CONFIGURING!!!
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifndef _FRAMELESSHELPER_VERSION_DEFINED_
|
||||
#define _FRAMELESSHELPER_VERSION_DEFINED_
|
||||
|
||||
[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_MAJOR = 2;
|
||||
[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_MINOR = 5;
|
||||
[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_PATCH = 0;
|
||||
//[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_TWEAK = 0;
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_VERSION_STR[] = "2.5.0";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMPILE_DATETIME_STR[] = "UNKNOWN";
|
||||
#ifndef _FRAMELESSHELPER_VERSION_INCLUDE_GUARD_
|
||||
#define _FRAMELESSHELPER_VERSION_INCLUDE_GUARD_
|
||||
|
||||
#define __FRAMELESSHELPER_VERSION_MAJOR__ 2
|
||||
#define __FRAMELESSHELPER_VERSION_MINOR__ 5
|
||||
#define __FRAMELESSHELPER_VERSION_PATCH__ 0
|
||||
//#define __FRAMELESSHELPER_VERSION_TWEAK__ 0
|
||||
#define __FRAMELESSHELPER_VERSION_TWEAK__ 0
|
||||
#define __FRAMELESSHELPER_VERSION__ 0x02050000
|
||||
#define __FRAMELESSHELPER__ 0x02050000
|
||||
|
||||
#endif // _FRAMELESSHELPER_VERSION_DEFINED_
|
||||
[[maybe_unused]] inline constexpr const unsigned long FRAMELESSHELPER_VERSION_MAJOR = 2;
|
||||
[[maybe_unused]] inline constexpr const unsigned long FRAMELESSHELPER_VERSION_MINOR = 5;
|
||||
[[maybe_unused]] inline constexpr const unsigned long FRAMELESSHELPER_VERSION_PATCH = 0;
|
||||
[[maybe_unused]] inline constexpr const unsigned long FRAMELESSHELPER_VERSION_TWEAK = 0;
|
||||
[[maybe_unused]] inline constexpr const unsigned long FRAMELESSHELPER_VERSION = 0x02050000;
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_VERSION_STR[] = "2.5.0";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_HASH_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_SUBJECT_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_AUTHOR_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_DATETIME_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_BRANCH_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMPILER_NAME_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMPILER_VERSION_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMPILER_VENDOR_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_BUILD_DATETIME_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_ARCHITECTURE_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_CMAKE_VERSION_STR[] = "UNKNOWN";
|
||||
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_CMAKE_GENERATOR_STR[] = "UNKNOWN";
|
||||
|
||||
#endif // _FRAMELESSHELPER_VERSION_INCLUDE_GUARD_
|
||||
|
|
|
@ -9,9 +9,6 @@ QUICK_PUB_INC_DIR = $$COMMON_INC_DIR/Quick
|
|||
QUICK_PRIV_INC_DIR = $$QUICK_PUB_INC_DIR/private
|
||||
QUICK_SRC_DIR = $$PWD/../src/quick
|
||||
|
||||
DEFINES += \
|
||||
FRAMELESSHELPER_QUICK_STATIC
|
||||
|
||||
INCLUDEPATH += \
|
||||
$$BASE_INC_DIR \
|
||||
$$COMMON_INC_DIR \
|
||||
|
|
|
@ -6,9 +6,6 @@ WIDGETS_PUB_INC_DIR = $$COMMON_INC_DIR/Widgets
|
|||
WIDGETS_PRIV_INC_DIR = $$WIDGETS_PUB_INC_DIR/private
|
||||
WIDGETS_SRC_DIR = $$PWD/../src/widgets
|
||||
|
||||
DEFINES += \
|
||||
FRAMELESSHELPER_WIDGETS_STATIC
|
||||
|
||||
INCLUDEPATH += \
|
||||
$$BASE_INC_DIR \
|
||||
$$COMMON_INC_DIR \
|
||||
|
|
Loading…
Reference in New Issue