mirror of
https://bitbucket.org/smil3y/katie.git
synced 2025-02-23 18:32:55 +00:00
misc cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev
parent
948632ea6f
commit
b0c8200eb5
5 changed files with 6 additions and 112 deletions
8
README
8
README
|
|
@ -13,7 +13,7 @@ There are several things you should be aware before considering Katie:
|
|||
- QMake build system replaced with CMake
|
||||
- QStyleOption*V{2,3,4} classes have been merged
|
||||
- QKeyEventEx and QKeyEvent classes have been merged
|
||||
- OpenSSL and D-Bus are not a runtime dependencies, they must be linked to
|
||||
- OpenSSL and D-Bus cannot be runtime dependencies, they must be linked to
|
||||
during build
|
||||
- QtUiTools is build as shared library by default
|
||||
- Phonon has been updated to 4.8.51
|
||||
|
|
@ -36,6 +36,6 @@ QTBUG-28321, QTBUG-21993, QTBUG-26590, QTBUG-2124, QTBUG-20482,
|
|||
QTBUG-41361, QTBUG-40153, QTBUG-35479
|
||||
|
||||
Unless you use QMake and QDoc porting to Katie or even supporting it along with
|
||||
Qt4 in the same code-base is trivial and requires only a minor changes because
|
||||
Katie is mostly compatible with Qt4. Should you enouncter a problem please
|
||||
report it at https://github.com/fluxer/katie/issues.
|
||||
Qt4 in the same codebase is trivial and requires only minor changes because
|
||||
Katie is mostly source compatible with Qt4. Should you enouncter a problem
|
||||
please report it at https://github.com/fluxer/katie/issues.
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
#
|
||||
# qmake configuration for win32-msvc2005
|
||||
#
|
||||
# Written for Microsoft Visual C++ 2005
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = MSVC.NET
|
||||
TEMPLATE = app
|
||||
CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
|
||||
QT += core gui
|
||||
DEFINES += UNICODE WIN32
|
||||
QMAKE_COMPILER_DEFINES += _MSC_VER=1400 WIN32
|
||||
|
||||
QMAKE_CC = cl
|
||||
QMAKE_LEX = flex
|
||||
QMAKE_LEXFLAGS =
|
||||
QMAKE_YACC = byacc
|
||||
QMAKE_YACCFLAGS = -d
|
||||
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t-
|
||||
QMAKE_CFLAGS_WARN_ON = -W3
|
||||
QMAKE_CFLAGS_WARN_OFF = -W0
|
||||
QMAKE_CFLAGS_RELEASE = -O2 -MD
|
||||
QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
|
||||
QMAKE_CFLAGS_DEBUG = -Zi -MDd
|
||||
QMAKE_CFLAGS_YACC =
|
||||
QMAKE_CFLAGS_LTCG = -GL
|
||||
|
||||
QMAKE_CXX = $$QMAKE_CC
|
||||
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
|
||||
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189
|
||||
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
|
||||
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
|
||||
QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
|
||||
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
|
||||
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
|
||||
QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG
|
||||
QMAKE_CXXFLAGS_STL_ON = -EHsc
|
||||
QMAKE_CXXFLAGS_STL_OFF =
|
||||
QMAKE_CXXFLAGS_RTTI_ON = -GR
|
||||
QMAKE_CXXFLAGS_RTTI_OFF =
|
||||
QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
|
||||
QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
|
||||
|
||||
QMAKE_INCDIR =
|
||||
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
|
||||
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
|
||||
|
||||
QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
|
||||
QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
|
||||
QMAKE_RUN_CC_IMP_BATCH = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<<
|
||||
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
|
||||
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
|
||||
QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
|
||||
|
||||
QMAKE_LINK = link
|
||||
QMAKE_LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT
|
||||
QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO
|
||||
QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
|
||||
QMAKE_LFLAGS_DEBUG = /DEBUG
|
||||
QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE
|
||||
QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS
|
||||
QMAKE_LFLAGS_EXE = \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
|
||||
QMAKE_LFLAGS_DLL = /DLL
|
||||
QMAKE_LFLAGS_LTCG = /LTCG
|
||||
|
||||
QMAKE_LIBS_CORE = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib
|
||||
QMAKE_LIBS_GUI = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ws2_32.lib ole32.lib user32.lib advapi32.lib
|
||||
QMAKE_LIBS_NETWORK = ws2_32.lib
|
||||
QMAKE_LIBS_OPENGL = glu32.lib opengl32.lib gdi32.lib user32.lib
|
||||
QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
|
||||
|
||||
QMAKE_LIBS_QT_ENTRY = -lqtmain
|
||||
|
||||
QMAKE_MOC = $$[QT_INSTALL_BINS]\\moc.exe
|
||||
QMAKE_UIC = $$[QT_INSTALL_BINS]\\uic.exe
|
||||
QMAKE_IDC = $$[QT_INSTALL_BINS]\\idc.exe
|
||||
|
||||
QMAKE_IDL = midl
|
||||
QMAKE_LIB = lib /NOLOGO
|
||||
QMAKE_RC = rc
|
||||
|
||||
QMAKE_ZIP = zip -r -9
|
||||
|
||||
QMAKE_COPY = copy /y
|
||||
QMAKE_COPY_DIR = xcopy /s /q /y /i
|
||||
QMAKE_MOVE = move
|
||||
QMAKE_DEL_FILE = del
|
||||
QMAKE_DEL_DIR = rmdir
|
||||
QMAKE_CHK_DIR_EXISTS = if not exist
|
||||
QMAKE_MKDIR = mkdir
|
||||
|
||||
VCPROJ_EXTENSION = .vcproj
|
||||
VCSOLUTION_EXTENSION = .sln
|
||||
VCPROJ_KEYWORD = Qt4VSv1.0
|
||||
load(qt_config)
|
||||
|
|
@ -104,15 +104,6 @@ void QDeclarativeValueTypeFactory::registerValueTypes()
|
|||
qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("QtQuick",1,0,"Font");
|
||||
}
|
||||
|
||||
void QDeclarativeValueTypeFactory::registerValueTypesCompat()
|
||||
{
|
||||
if (QApplication::type() == QApplication::Tty)
|
||||
return;
|
||||
|
||||
qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("Qt",4,7,"Easing");
|
||||
qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("Qt",4,7,"Font");
|
||||
}
|
||||
|
||||
QDeclarativeValueType *QDeclarativeValueTypeFactory::valueType(int t)
|
||||
{
|
||||
QDeclarativeValueType *rv = 0;
|
||||
|
|
|
|||
|
|
@ -90,7 +90,6 @@ public:
|
|||
static QDeclarativeValueType *valueType(int);
|
||||
|
||||
static void registerValueTypes();
|
||||
static void registerValueTypesCompat();
|
||||
|
||||
QDeclarativeValueType *operator[](int idx) const {
|
||||
if (idx < 0 || idx >= (int)QVariant::UserType) return 0;
|
||||
|
|
|
|||
|
|
@ -717,11 +717,10 @@ void QMetaObjectBuilder::addMetaObject
|
|||
if ((members & RelatedMetaObjects) != 0) {
|
||||
Q_ASSERT(priv(prototype->d.data)->revision >= 6);
|
||||
#ifdef Q_NO_DATA_RELOCATION
|
||||
const QMetaObjectAccessor *objects = 0;
|
||||
const QMetaObjectAccessor *objects = prototype->d.relatedMetaObjects;
|
||||
#else
|
||||
const QMetaObject **objects;
|
||||
const QMetaObject **objects = prototype->d.relatedMetaObjects;
|
||||
#endif
|
||||
objects = prototype->d.relatedMetaObjects;
|
||||
if (objects) {
|
||||
while (*objects != 0) {
|
||||
addRelatedMetaObject(*objects);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue