This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/src/corelib/io/qresource.cpp w/src/corelib/io/qresource.cpp | |
index bfd0eef..015644d 100644 | |
--- i/src/corelib/io/qresource.cpp | |
+++ w/src/corelib/io/qresource.cpp | |
@@ -101,7 +101,8 @@ class QResourceRoot | |
enum Flags | |
{ | |
Compressed = 0x01, | |
- Directory = 0x02 | |
+ Directory = 0x02, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[whopper-lion:~/build/qt/5.3/qtbase/src/gui] $ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -c -Xclang -include-pch -Xclang .pch/Qt5Gui_debug/c++.pch -pipe -g -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.7 -fvisibility=hidden -fvisibility-inlines-hidden -fno-exceptions -Wall -W -Werror -Wno-error=#warnings -Wno-error=deprecated-declarations -fPIC -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_EVDEV -DQT_NO_USING_NAMESPACE -DQT_BUILD_GUI_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_USE_BUNDLED_LIBPNG -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_CORE_LIB -I/Users/torarne/dev/qt/5.x/qtbase/mkspecs/macx-clang -I/Users/torarne/dev/qt/5.x/qtbase/src/gui -I../../include -I../../include/QtGui -I../../include/QtGui |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
running "/Users/torarne/build/creator/3.1/bin/Qt Creator.app/Contents/Resources/ios/iostool" ("-device-id", "62bdbab8867c818b72360f261ca33f500bdc0a19", "-bundle", "/Users/torarne/install/5.3.0-rc1/Examples/Qt-5.3/widgets/animation/build-animatedtiles-iphoneos_clang_Qt_5_3_0_ios-Debug/Debug-iphoneos/animatedtiles.app", "-timeout", "1000", "-deploy") | |
subprocessHasData, state: 2 | |
subprocessHasData read "<?xml version="1.0" encoding="UTF-8"?> | |
<query_result" | |
subprocessHasData, state: 2 | |
subprocessHasData read "> | |
<status progress="0" max_progress="200">PreflightingTransfer</status>" | |
subprocessHasData, state: 2 | |
subprocessHasData read " | |
<status progress="10" max_progress="200">TransferringPackage</status>" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git c/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm i/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | |
index 9248785..81ab5e4 100644 | |
--- c/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | |
+++ i/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | |
@@ -407,28 +407,34 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFo | |
if (fallbackLists.contains(family)) | |
return fallbackLists.value(family); | |
- QCFType<CFMutableDictionaryRef> attributes = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); | |
- CFDictionaryAddValue(attributes, kCTFontFamilyNameAttribute, QCFString(family)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/src/widgets/kernel/qapplication.cpp w/src/widgets/kernel/qapplication.cpp | |
index b4c4ffe..b4a804a 100644 | |
--- i/src/widgets/kernel/qapplication.cpp | |
+++ w/src/widgets/kernel/qapplication.cpp | |
@@ -2048,7 +2048,7 @@ void QApplication::setActiveWindow(QWidget* act) | |
QWidget *w = QApplicationPrivate::active_window->focusWidget(); | |
if (w && w->isVisible() /*&& w->focusPolicy() != QWidget::NoFocus*/) | |
w->setFocus(Qt::ActiveWindowFocusReason); | |
- else { | |
+ else if (QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::InitialWidgetFocusOnWindowActivate).toBool()) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<a href="webcal://www.bardarswingclub.no/kalender.ics">foo</a> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import QtQuick 2.0 | |
Rectangle { | |
width: text.paintedWidth | |
height: text.paintedHeight | |
visible: fpsProbe.fps >= 0 | |
color: { | |
if (fpsProbe.fps < 30) | |
return "red"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TARGET = jpeg2tiff | |
CFLAGS = -Wall -O2 | |
LFLAGS = -ltiff -ljpeg | |
$(TARGET): jpeg2tiff.cpp | |
$(CXX) $< -o $@ $(CFLAGS) $(LFLAGS) $(DEFINES) | |
all: $(TARGET) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
precmd () { | |
local _user='$(unset TERM; _prompt_user)' | |
print -Pn "\e]0;$_user%m:%~\a" | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{vegas:~/annex/test} $ git annex metadata | |
metadata a | |
lastchanged=2014-10-01@22-56-47 | |
ok | |
metadata b | |
lastchanged=2014-10-01@22-56-47 | |
ok | |
metadata c | |
lastchanged=2014-10-01@22-56-47 | |
ok |