mirror of
https://github.com/silverqx/TinyORM.git
synced 2026-05-02 22:49:18 -05:00
qmake used DEFINE *= where possible
This commit is contained in:
@@ -496,7 +496,7 @@ TEMPLATE = app
|
||||
|
||||
CONFIG *= cmdline
|
||||
|
||||
DEFINES += PROJECT_TINYORM_HELLOWORLD
|
||||
DEFINES *= PROJECT_TINYORM_HELLOWORLD
|
||||
|
||||
SOURCES += $$PWD/main.cpp
|
||||
|
||||
|
||||
@@ -633,7 +633,7 @@ TARGET = tom
|
||||
|
||||
CONFIG *= cmdline
|
||||
|
||||
DEFINES += PROJECT_TOM
|
||||
DEFINES *= PROJECT_TOM
|
||||
|
||||
SOURCES += $$PWD/main.cpp
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ CONFIG *= cmdline
|
||||
# TinyTom example application defines
|
||||
# ---
|
||||
|
||||
DEFINES += PROJECT_TOM_EXAMPLE
|
||||
DEFINES *= PROJECT_TOM_EXAMPLE
|
||||
|
||||
# TinyTom example application header and source files
|
||||
# ---
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ CONFIG -= c++11 app_bundle
|
||||
# In order to do so, uncomment the following line.
|
||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
# Disables all the APIs deprecated before Qt 6.0.0
|
||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000
|
||||
DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x060000
|
||||
|
||||
#DEFINES *= QT_ASCII_CAST_WARNINGS
|
||||
#DEFINES *= QT_NO_CAST_FROM_ASCII
|
||||
|
||||
@@ -27,7 +27,7 @@ defineTest(tiny_resource_and_manifest) {
|
||||
QMAKE_DISTCLEAN += $$rcFile
|
||||
|
||||
# Needed in the RC file, MinGW does not define _DEBUG macro
|
||||
mingw:CONFIG(debug, debug|release): DEFINES += _DEBUG
|
||||
mingw:CONFIG(debug, debug|release): DEFINES *= _DEBUG
|
||||
|
||||
RC_INCLUDEPATH = $$1
|
||||
RC_FILE = $$rcFile
|
||||
|
||||
+6
-6
@@ -3,14 +3,14 @@
|
||||
|
||||
# All have to be defined because of checks at the beginning of the qt_windows.h
|
||||
# Windows 10 1903 "19H1" - 0x0A000007
|
||||
DEFINES += WINVER=_WIN32_WINNT_WIN10
|
||||
DEFINES += NTDDI_VERSION=NTDDI_WIN10_19H1
|
||||
DEFINES += _WIN32_WINNT=_WIN32_WINNT_WIN10
|
||||
DEFINES *= WINVER=_WIN32_WINNT_WIN10
|
||||
DEFINES *= NTDDI_VERSION=NTDDI_WIN10_19H1
|
||||
DEFINES *= _WIN32_WINNT=_WIN32_WINNT_WIN10
|
||||
# Internet Explorer 11
|
||||
DEFINES += _WIN32_IE=_WIN32_IE_IE110
|
||||
DEFINES *= _WIN32_IE=_WIN32_IE_IE110
|
||||
# Exclude unneeded header files
|
||||
DEFINES += WIN32_LEAN_AND_MEAN
|
||||
DEFINES += NOMINMAX
|
||||
DEFINES *= WIN32_LEAN_AND_MEAN
|
||||
DEFINES *= NOMINMAX
|
||||
|
||||
# Latest qmake's msvc fixes
|
||||
# ---
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ include(../qmake/common.pri)
|
||||
# TinyORM defines
|
||||
# ---
|
||||
|
||||
DEFINES += PROJECT_TINYORM
|
||||
DEFINES *= PROJECT_TINYORM
|
||||
|
||||
# Build as the shared library
|
||||
CONFIG(shared, dll|shared|static|staticlib) | \
|
||||
|
||||
@@ -16,7 +16,7 @@ CONFIG *= create_prl create_pc create_libtool
|
||||
# TinyUtils library defines
|
||||
# ---
|
||||
|
||||
DEFINES += PROJECT_TINYUTILS
|
||||
DEFINES *= PROJECT_TINYUTILS
|
||||
|
||||
# Build as the shared library
|
||||
CONFIG(shared, dll|shared|static|staticlib) | \
|
||||
|
||||
@@ -7,15 +7,15 @@ QT -= sql
|
||||
SOURCES = tst_versions.cpp
|
||||
|
||||
tom_example:!disable_tom: \
|
||||
DEFINES += TINYTOM_EXAMPLE
|
||||
DEFINES *= TINYTOM_EXAMPLE
|
||||
|
||||
# Used by checkFileVersion_*() tests
|
||||
win32 {
|
||||
DEFINES += TINYTEST_VERSIONS_IS_QMAKE
|
||||
DEFINES *= TINYTEST_VERSIONS_IS_QMAKE
|
||||
|
||||
CONFIG(shared, dll|shared|static|staticlib) | \
|
||||
CONFIG(dll, dll|shared|static|staticlib): \
|
||||
DEFINES += TINYTEST_VERSIONS_IS_SHARED_BUILD
|
||||
DEFINES *= TINYTEST_VERSIONS_IS_SHARED_BUILD
|
||||
|
||||
# File versions
|
||||
# ---
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
CONFIG(shared, dll|shared|static|staticlib) | \
|
||||
CONFIG(dll, dll|shared|static|staticlib): \
|
||||
DEFINES += TINYUTILS_LINKING_SHARED
|
||||
DEFINES *= TINYUTILS_LINKING_SHARED
|
||||
|
||||
# TinyUtils library headers include path
|
||||
# ---
|
||||
|
||||
@@ -29,7 +29,7 @@ win32-clang-msvc: \
|
||||
# Tests defines
|
||||
# ---
|
||||
|
||||
DEFINES += PROJECT_TINYORM_TEST
|
||||
DEFINES *= PROJECT_TINYORM_TEST
|
||||
|
||||
# Windows resource and manifest files
|
||||
# ---
|
||||
|
||||
@@ -16,7 +16,7 @@ CONFIG *= cmdline
|
||||
# TinyTom migrations for unit tests defines
|
||||
# ---
|
||||
|
||||
DEFINES += PROJECT_TOM_TESTDATA
|
||||
DEFINES *= PROJECT_TOM_TESTDATA
|
||||
|
||||
# TinyTom migrations for unit tests header and source files
|
||||
# ---
|
||||
|
||||
Reference in New Issue
Block a user